[neon/forks/qtkeychain/Neon/release] debian: manually merge from salsa
Jonathan Esk-Riddell
null at kde.org
Thu Sep 8 17:26:32 BST 2022
Git commit ca9cc5568cbeaec519cec94c26eab0c813d9d986 by Jonathan Esk-Riddell.
Committed on 08/09/2022 at 16:25.
Pushed by jriddell into branch 'Neon/release'.
manually merge from salsa
M +57 -4 debian/changelog
M +48 -5 debian/control
M +18 -17 debian/copyright
A +1 -0 debian/docs
M +1 -2 debian/libqt5keychain1.install
M +1 -1 debian/libqt5keychain1.symbols
A +2 -0 debian/libqt6keychain1.install
A +104 -0 debian/libqt6keychain1.symbols
D +0 -1 debian/patches/series
D +0 -202 debian/patches/use_system_GNUInstallDirs.cmake
R +0 -0 debian/qtkeychain-qt5-dev.install [from: debian/qt5keychain-dev.install - 100% similarity]
A +4 -0 debian/qtkeychain-qt6-dev.install
M +19 -2 debian/rules
M +1 -0 debian/upstream/metadata
M +4 -6 debian/watch
https://invent.kde.org/neon/forks/qtkeychain/commit/ca9cc5568cbeaec519cec94c26eab0c813d9d986
diff --git a/debian/changelog b/debian/changelog
index bd7d942..fc83123 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,62 @@
-qtkeychain (0.12.0-0neon) focal; urgency=medium
+qtkeychain (0.13.2-5) unstable; urgency=medium
- * New release
- * New release
+ * Build without Qt6 for archs without Qt6 support yet.
+ Thanks to Rick Mills <rickmills at kde.org> (Closes: 1007743)
- -- Jonathan Riddell <jr at jriddell.org> Wed, 17 Feb 2021 12:22:45 +0000
+ -- Sandro Knauß <hefee at debian.org> Fri, 18 Mar 2022 20:13:39 +0100
+
+qtkeychain (0.13.2-4) unstable; urgency=medium
+
+ * Add qt5keychain-dev as transitinal package.
+
+ -- Sandro Knauß <hefee at debian.org> Fri, 25 Feb 2022 20:25:01 +0100
+
+qtkeychain (0.13.2-3) unstable; urgency=medium
+
+ * Install qt6 pri file correctly under /usr/share/qt6.
+ * Update copyright file.
+
+ -- Sandro Knauß <hefee at debian.org> Thu, 24 Feb 2022 14:05:01 +0100
+
+qtkeychain (0.13.2-2) unstable; urgency=medium
+
+ [ Lu YaNing ]
+ * Add qtbase5-private-dev qt6-tools-dev qt6-tools-dev-tools
+ B-Ds.
+ * Add libgcrypt20-dev and qt6-l10n-tools B-Ds.
+
+ [ Sandro Knauß ]
+ * Enable Qt5 & Qt6 build.
+ * Fail build, if not everything is packaged.
+ * Add Qt6 packages:
+ - Rename qt5keychain-dev -> qtkeychain-qt5-dev because of consistency.
+ - Add libqt6keychain1
+ - Add qtkeychain-qt6-dev
+ - Provides qt5keychain-dev by qtkeychain-qt5-dev.
+ * Add symbols for libqt6keychain1.
+ * Add and update Build-Depends-Package for all symbols files.
+
+ -- Sandro Knauß <hefee at debian.org> Wed, 23 Feb 2022 11:08:41 +0100
+
+qtkeychain (0.13.2-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Remove upstream applied patch.
+ * Update copyright file.
+
+ -- Sandro Knauß <hefee at debian.org> Mon, 21 Feb 2022 17:39:25 +0100
+
+qtkeychain (0.12.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update d/watch to work with current github page.
+ * Bump debhelper from old 12 to 13.
+ * Set upstream metadata fields: Bug-Submit.
+ * Update installation path for trnaslations.
+ * Update docs paths.
+ * Update standards version to 4.6.0, no changes needed.
+
+ -- Sandro Knauß <hefee at debian.org> Sun, 19 Sep 2021 23:57:53 +0200
qtkeychain (0.10.0-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 599a673..31c5c37 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,20 @@ Priority: optional
Maintainer: ownCloud for Debian maintainers <pkg-owncloud-maintainers at lists.alioth.debian.org>
Uploaders: Sandro Knauß <hefee at debian.org>
Build-Depends: cmake,
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
+ libgcrypt20-dev,
libsecret-1-dev,
pkg-config,
pkg-kde-tools,
+ qt6-base-dev [amd64 arm64 armel armhf hurd-i386 i386 mips64el mipsel ppc64el riscv64],
+ qt6-l10n-tools [amd64 arm64 armel armhf hurd-i386 i386 mips64el mipsel ppc64el riscv64],
+ qt6-tools-dev [amd64 arm64 armel armhf hurd-i386 i386 mips64el mipsel ppc64el riscv64],
+ qt6-tools-dev-tools [amd64 arm64 armel armhf hurd-i386 i386 mips64el mipsel ppc64el riscv64],
+ qtbase5-private-dev,
qttools5-dev,
- qttools5-dev-tools
+ qttools5-dev-tools,
Rules-Requires-Root: no
-Standards-Version: 4.4.1
+Standards-Version: 4.6.0
Section: libs
Homepage: https://github.com/frankosterfeld/qtkeychain
Vcs-Git: https://salsa.debian.org/owncloud-team/qtkeychain.git
@@ -29,13 +35,36 @@ Description: Qt API to store passwords (QT5 version)
If none of them is available, qtkeychain will report an error or writes
with explicit request the password unencrypted at a file.
.
- This is the Version built for QT5
+ This is the Version built for QT5.
+
+Package: libqt6keychain1
+Architecture: amd64 arm64 armel armhf hurd-i386 i386 mips64el mipsel ppc64el riscv64
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Recommends: gnome-keyring | kwalletmanager
+Description: Qt API to store passwords (QT6 version)
+ It can use KWallet or GNOME Keyring, if one of them is available.
+ If none of them is available, qtkeychain will report an error or writes
+ with explicit request the password unencrypted at a file.
+ .
+ This is the Version built for QT6.
Package: qt5keychain-dev
+Section: oldlibs
+Architecture: all
+Depends: qtkeychain-qt5-dev, ${misc:Depends}
+Description: transitional package
+ This is a transitional package. It can safely be removed.
+
+Package: qtkeychain-qt5-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends: libqt5keychain1 (= ${binary:Version}), ${misc:Depends}
+Provides: qt5keychain-dev
+Breaks: qt5keychain-dev (<< 0.13.2-3~)
+Replaces: qt5keychain-dev (<< 0.13.2-3~)
Description: Development files for qtkeychain (QT5 version)
A Qt API to store passwords
.
@@ -43,4 +72,18 @@ Description: Development files for qtkeychain (QT5 version)
If none of them is available, qtkeychain will report an error or writes
with explicit request the password unencrypted at a file.
.
- This is the Version built for QT5
+ This is the Version built for QT5.
+
+Package: qtkeychain-qt6-dev
+Section: libdevel
+Architecture: amd64 arm64 armel armhf hurd-i386 i386 mips64el mipsel ppc64el riscv64
+Multi-Arch: same
+Depends: libqt6keychain1 (= ${binary:Version}), ${misc:Depends}
+Description: Development files for qtkeychain (QT6 version)
+ A Qt API to store passwords
+ .
+ It can use KWallet or GNOME Keyring, if one of them is available.
+ If none of them is available, qtkeychain will report an error or writes
+ with explicit request the password unencrypted at a file.
+ .
+ This is the Version built for QT6.
diff --git a/debian/copyright b/debian/copyright
index 9751fbd..251ce4b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,26 +3,27 @@ Upstream-Name: qtkeychain
Source: https://github.com/frankosterfeld/qtkeychain
Files: *
-Copyright: 2011-2015 Frank Osterfeld <frank.osterfeld at gmail.com>
- 2016 Mathias Hasselmann <mathias.hasselmann at kdab.com>
-License: BSD-2-clause
+Copyright: 2011-2015, Frank Osterfeld <frank.osterfeld at gmail.com>
+ 2018, François Revol <revol at free.fr>
+ 2016, Mathias Hasselmann <mathias.hasselmann at kdab.com>
+License: BSD-2-Clause
-Files: debian/*
-Copyright: 2013-2015 Sandro Knauß <hefee at debian.org>
-License: BSD-2-clause
-
-Files: cmake/Modules/GNUInstallDirs.cmake
- cmake/Modules/ECMGeneratePriFile.cmake
+Files: cmake/Modules/ECMGeneratePriFile.cmake
cmake/Modules/ECMPackageConfigHelpers.cmake
cmake/Modules/ECMSetupVersion.cmake
-Copyright: 2014 David Faure <faure at kde.org>
- 2014 Alex Merry <alex.merry at kdemail.net>
- 2013 Stephen Kelly <steveire at gmail.com>
- 2011 Kitware, Inc.
- 2011 Nikita Krupen'ko <krnekit at gmail.com>
-License: BSD-3-clause
+Copyright: 2014, Alex Merry <alex.merry at kde.org>
+ 2012, Alexander Neundorf <neundorf at kde.org>
+ 2014, David Faure <faure at kde.org>
+ 2011, Kitware, Inc
+ 2011, Nikita Krupen'ko <krnekit at gmail.com>
+ 2013, Stephen Kelly <steveire at gmail.com>
+License: BSD-3-Clause
+
+Files: debian/*
+Copyright: 2013-2022, Sandro Knauß <hefee at debian.org>
+License: BSD-2-Clause
-License: BSD-2-clause
+License: BSD-2-Clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -44,7 +45,7 @@ License: BSD-2-clause
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-License: BSD-3-clause
+License: BSD-3-Clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..0bb2277
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+ReadMe.md
diff --git a/debian/libqt5keychain1.install b/debian/libqt5keychain1.install
index 8d69ed0..8d302a4 100644
--- a/debian/libqt5keychain1.install
+++ b/debian/libqt5keychain1.install
@@ -1,3 +1,2 @@
-usr/lib/*/libqt5keychain.so.0.*
-usr/lib/*/libqt5keychain.so.1
+usr/lib/*/libqt5keychain.so.*
usr/share/qt5keychain
diff --git a/debian/libqt5keychain1.symbols b/debian/libqt5keychain1.symbols
index 176831d..3ec64be 100644
--- a/debian/libqt5keychain1.symbols
+++ b/debian/libqt5keychain1.symbols
@@ -1,6 +1,6 @@
# SymbolsHelper-Confirmed: 0.7.0 amd64
libqt5keychain.so.1 libqt5keychain1 #MINVER#
-* Build-Depends-Package: qt5keychain-dev
+* Build-Depends-Package: qtkeychain-qt5-dev
_ZN9QKeychain15ReadPasswordJob11qt_metacallEN11QMetaObject4CallEiPPv at Base 0.7.0
_ZN9QKeychain15ReadPasswordJob11qt_metacastEPKc at Base 0.7.0
_ZN9QKeychain15ReadPasswordJob16staticMetaObjectE at Base 0.7.0
diff --git a/debian/libqt6keychain1.install b/debian/libqt6keychain1.install
new file mode 100644
index 0000000..2f6f601
--- /dev/null
+++ b/debian/libqt6keychain1.install
@@ -0,0 +1,2 @@
+usr/lib/*/libqt6keychain.so.*
+usr/share/qt6keychain
diff --git a/debian/libqt6keychain1.symbols b/debian/libqt6keychain1.symbols
new file mode 100644
index 0000000..a2789ce
--- /dev/null
+++ b/debian/libqt6keychain1.symbols
@@ -0,0 +1,104 @@
+# SymbolsHelper-Confirmed: 0.13.2 amd64
+libqt6keychain.so.1 libqt6keychain1 #MINVER#
+* Build-Depends-Package: qtkeychain-qt6-dev
+ _ZN9QKeychain15ReadPasswordJob11qt_metacallEN11QMetaObject4CallEiPPv at Base 0.13.2
+ _ZN9QKeychain15ReadPasswordJob11qt_metacastEPKc at Base 0.13.2
+ _ZN9QKeychain15ReadPasswordJob16staticMetaObjectE at Base 0.13.2
+ _ZN9QKeychain15ReadPasswordJobC1ERK7QStringP7QObject at Base 0.13.2
+ _ZN9QKeychain15ReadPasswordJobC2ERK7QStringP7QObject at Base 0.13.2
+ _ZN9QKeychain15ReadPasswordJobD0Ev at Base 0.13.2
+ _ZN9QKeychain15ReadPasswordJobD1Ev at Base 0.13.2
+ _ZN9QKeychain15ReadPasswordJobD2Ev at Base 0.13.2
+ _ZN9QKeychain16WritePasswordJob11qt_metacallEN11QMetaObject4CallEiPPv at Base 0.13.2
+ _ZN9QKeychain16WritePasswordJob11qt_metacastEPKc at Base 0.13.2
+ _ZN9QKeychain16WritePasswordJob11setTextDataERK7QString at Base 0.13.2
+ _ZN9QKeychain16WritePasswordJob13setBinaryDataERK10QByteArray at Base 0.13.2
+ _ZN9QKeychain16WritePasswordJob16staticMetaObjectE at Base 0.13.2
+ _ZN9QKeychain16WritePasswordJobC1ERK7QStringP7QObject at Base 0.13.2
+ _ZN9QKeychain16WritePasswordJobC2ERK7QStringP7QObject at Base 0.13.2
+ _ZN9QKeychain16WritePasswordJobD0Ev at Base 0.13.2
+ _ZN9QKeychain16WritePasswordJobD1Ev at Base 0.13.2
+ _ZN9QKeychain16WritePasswordJobD2Ev at Base 0.13.2
+ _ZN9QKeychain17DeletePasswordJob11qt_metacallEN11QMetaObject4CallEiPPv at Base 0.13.2
+ _ZN9QKeychain17DeletePasswordJob11qt_metacastEPKc at Base 0.13.2
+ _ZN9QKeychain17DeletePasswordJob16staticMetaObjectE at Base 0.13.2
+ _ZN9QKeychain17DeletePasswordJobC1ERK7QStringP7QObject at Base 0.13.2
+ _ZN9QKeychain17DeletePasswordJobC2ERK7QStringP7QObject at Base 0.13.2
+ _ZN9QKeychain17DeletePasswordJobD0Ev at Base 0.13.2
+ _ZN9QKeychain17DeletePasswordJobD1Ev at Base 0.13.2
+ _ZN9QKeychain17DeletePasswordJobD2Ev at Base 0.13.2
+ _ZN9QKeychain3Job11qt_metacallEN11QMetaObject4CallEiPPv at Base 0.13.2
+ _ZN9QKeychain3Job11qt_metacastEPKc at Base 0.13.2
+ _ZN9QKeychain3Job11setSettingsEP9QSettings at Base 0.13.2
+ _ZN9QKeychain3Job12emitFinishedEv at Base 0.13.2
+ _ZN9QKeychain3Job13setAutoDeleteEb at Base 0.13.2
+ _ZN9QKeychain3Job14scheduledStartEv at Base 0.13.2
+ _ZN9QKeychain3Job14setErrorStringERK7QString at Base 0.13.2
+ _ZN9QKeychain3Job16staticMetaObjectE at Base 0.13.2
+ _ZN9QKeychain3Job19setInsecureFallbackEb at Base 0.13.2
+ _ZN9QKeychain3Job21emitFinishedWithErrorENS_5ErrorERK7QString at Base 0.13.2
+ _ZN9QKeychain3Job5startEv at Base 0.13.2
+ _ZN9QKeychain3Job6setKeyERK7QString at Base 0.13.2
+ _ZN9QKeychain3Job7doStartEv at Base 0.13.2
+ _ZN9QKeychain3Job8finishedEPS0_ at Base 0.13.2
+ _ZN9QKeychain3Job8setErrorENS_5ErrorE at Base 0.13.2
+ _ZN9QKeychain3JobC1EPNS_10JobPrivateEP7QObject at Base 0.13.2
+ _ZN9QKeychain3JobC2EPNS_10JobPrivateEP7QObject at Base 0.13.2
+ _ZN9QKeychain3JobD0Ev at Base 0.13.2
+ _ZN9QKeychain3JobD1Ev at Base 0.13.2
+ _ZN9QKeychain3JobD2Ev at Base 0.13.2
+ _ZNK9QKeychain15ReadPasswordJob10binaryDataEv at Base 0.13.2
+ _ZNK9QKeychain15ReadPasswordJob10metaObjectEv at Base 0.13.2
+ _ZNK9QKeychain15ReadPasswordJob8textDataEv at Base 0.13.2
+ _ZNK9QKeychain16WritePasswordJob10metaObjectEv at Base 0.13.2
+ _ZNK9QKeychain17DeletePasswordJob10metaObjectEv at Base 0.13.2
+ _ZNK9QKeychain3Job10autoDeleteEv at Base 0.13.2
+ _ZNK9QKeychain3Job10metaObjectEv at Base 0.13.2
+ _ZNK9QKeychain3Job11errorStringEv at Base 0.13.2
+ _ZNK9QKeychain3Job16insecureFallbackEv at Base 0.13.2
+ _ZNK9QKeychain3Job3keyEv at Base 0.13.2
+ _ZNK9QKeychain3Job5errorEv at Base 0.13.2
+ _ZNK9QKeychain3Job7serviceEv at Base 0.13.2
+ _ZNK9QKeychain3Job8settingsEv at Base 0.13.2
+ (optional=templinst)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_8QVariantESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE24_M_get_insert_unique_posERS2_ at Base 0.13.2
+ (optional=templinst)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_8QVariantESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS4_ERS2_ at Base 0.13.2
+ _ZTIN9QKeychain15ReadPasswordJobE at Base 0.13.2
+ _ZTIN9QKeychain16WritePasswordJobE at Base 0.13.2
+ _ZTIN9QKeychain17DeletePasswordJobE at Base 0.13.2
+ _ZTIN9QKeychain3JobE at Base 0.13.2
+ _ZTSN9QKeychain15ReadPasswordJobE at Base 0.13.2
+ _ZTSN9QKeychain16WritePasswordJobE at Base 0.13.2
+ _ZTSN9QKeychain17DeletePasswordJobE at Base 0.13.2
+ _ZTSN9QKeychain3JobE at Base 0.13.2
+ _ZTVN9QKeychain15ReadPasswordJobE at Base 0.13.2
+ _ZTVN9QKeychain16WritePasswordJobE at Base 0.13.2
+ _ZTVN9QKeychain17DeletePasswordJobE at Base 0.13.2
+ _ZTVN9QKeychain3JobE at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeI10QByteArrayE10getCopyCtrEvENUlPKNS_18QMetaTypeInterfaceEPvPKvE_4_FUNES5_S6_S8_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeI10QByteArrayE10getMoveCtrEvENUlPKNS_18QMetaTypeInterfaceEPvS6_E_4_FUNES5_S6_S6_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeI10QByteArrayE13getDefaultCtrEvENUlPKNS_18QMetaTypeInterfaceEPvE_4_FUNES5_S6_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeI10QByteArrayE7getDtorEvENUlPKNS_18QMetaTypeInterfaceEPvE_4_FUNES5_S6_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeI4QMapI7QString8QVariantEE10getCopyCtrEvENUlPKNS_18QMetaTypeInterfaceEPvPKvE_4_FUNES8_S9_SB_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeI4QMapI7QString8QVariantEE10getMoveCtrEvENUlPKNS_18QMetaTypeInterfaceEPvS9_E_4_FUNES8_S9_S9_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeI4QMapI7QString8QVariantEE13getDefaultCtrEvENUlPKNS_18QMetaTypeInterfaceEPvE_4_FUNES8_S9_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeI4QMapI7QString8QVariantEE7getDtorEvENUlPKNS_18QMetaTypeInterfaceEPvE_4_FUNES8_S9_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeI5QListI7QStringEE10getCopyCtrEvENUlPKNS_18QMetaTypeInterfaceEPvPKvE_4_FUNES7_S8_SA_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeI5QListI7QStringEE10getMoveCtrEvENUlPKNS_18QMetaTypeInterfaceEPvS8_E_4_FUNES7_S8_S8_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeI5QListI7QStringEE13getDefaultCtrEvENUlPKNS_18QMetaTypeInterfaceEPvE_4_FUNES7_S8_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeI5QListI7QStringEE7getDtorEvENUlPKNS_18QMetaTypeInterfaceEPvE_4_FUNES7_S8_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeI7QStringE10getCopyCtrEvENUlPKNS_18QMetaTypeInterfaceEPvPKvE_4_FUNES5_S6_S8_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeI7QStringE10getMoveCtrEvENUlPKNS_18QMetaTypeInterfaceEPvS6_E_4_FUNES5_S6_S6_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeI7QStringE13getDefaultCtrEvENUlPKNS_18QMetaTypeInterfaceEPvE_4_FUNES5_S6_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeI7QStringE7getDtorEvENUlPKNS_18QMetaTypeInterfaceEPvE_4_FUNES5_S6_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeIP7QObjectE10getCopyCtrEvENUlPKNS_18QMetaTypeInterfaceEPvPKvE_4_FUNES6_S7_S9_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeIP7QObjectE10getMoveCtrEvENUlPKNS_18QMetaTypeInterfaceEPvS7_E_4_FUNES6_S7_S7_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeIP7QObjectE13getDefaultCtrEvENUlPKNS_18QMetaTypeInterfaceEPvE_4_FUNES6_S7_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeIbE10getCopyCtrEvENUlPKNS_18QMetaTypeInterfaceEPvPKvE_4_FUNES4_S5_S7_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeIbE10getMoveCtrEvENUlPKNS_18QMetaTypeInterfaceEPvS5_E_4_FUNES4_S5_S5_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeIbE13getDefaultCtrEvENUlPKNS_18QMetaTypeInterfaceEPvE_4_FUNES4_S5_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeIiE10getCopyCtrEvENUlPKNS_18QMetaTypeInterfaceEPvPKvE_4_FUNES4_S5_S7_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeIiE10getMoveCtrEvENUlPKNS_18QMetaTypeInterfaceEPvS5_E_4_FUNES4_S5_S5_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeIiE13getDefaultCtrEvENUlPKNS_18QMetaTypeInterfaceEPvE_4_FUNES4_S5_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeIxE10getCopyCtrEvENUlPKNS_18QMetaTypeInterfaceEPvPKvE_4_FUNES4_S5_S7_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeIxE10getMoveCtrEvENUlPKNS_18QMetaTypeInterfaceEPvS5_E_4_FUNES4_S5_S5_ at Base 0.13.2
+ (optional=templinst)_ZZN9QtPrivate16QMetaTypeForTypeIxE13getDefaultCtrEvENUlPKNS_18QMetaTypeInterfaceEPvE_4_FUNES4_S5_ at Base 0.13.2
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7c75c50..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-use_system_GNUInstallDirs.cmake
diff --git a/debian/patches/use_system_GNUInstallDirs.cmake b/debian/patches/use_system_GNUInstallDirs.cmake
deleted file mode 100644
index cead4a2..0000000
--- a/debian/patches/use_system_GNUInstallDirs.cmake
+++ /dev/null
@@ -1,202 +0,0 @@
-Description: FTBFS on !linux: libraries left in /usr/lib
- Remove cmake/Modules/GNUInstallDirs.cmake to use the shipped version from debian.
-Author: Sandro Knauß <hefee at debian.org>
-Origin: debian
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=710340
-Forwarded: https://github.com/frankosterfeld/qtkeychain/issues/20
-Last-Update: 2013-09-27
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: qtkeychain/cmake/Modules/GNUInstallDirs.cmake
-===================================================================
---- qtkeychain.orig/cmake/Modules/GNUInstallDirs.cmake 2013-09-27 14:21:48.499137669 +0200
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,188 +0,0 @@
--# - Define GNU standard installation directories
--# Provides install directory variables as defined for GNU software:
--# http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
--# Inclusion of this module defines the following variables:
--# CMAKE_INSTALL_<dir> - destination for files of a given type
--# CMAKE_INSTALL_FULL_<dir> - corresponding absolute path
--# where <dir> is one of:
--# BINDIR - user executables (bin)
--# SBINDIR - system admin executables (sbin)
--# LIBEXECDIR - program executables (libexec)
--# SYSCONFDIR - read-only single-machine data (etc)
--# SHAREDSTATEDIR - modifiable architecture-independent data (com)
--# LOCALSTATEDIR - modifiable single-machine data (var)
--# LIBDIR - object code libraries (lib or lib64 or lib/<multiarch-tuple> on Debian)
--# INCLUDEDIR - C header files (include)
--# OLDINCLUDEDIR - C header files for non-gcc (/usr/include)
--# DATAROOTDIR - read-only architecture-independent data root (share)
--# DATADIR - read-only architecture-independent data (DATAROOTDIR)
--# INFODIR - info documentation (DATAROOTDIR/info)
--# LOCALEDIR - locale-dependent data (DATAROOTDIR/locale)
--# MANDIR - man documentation (DATAROOTDIR/man)
--# DOCDIR - documentation root (DATAROOTDIR/doc/PROJECT_NAME)
--# Each CMAKE_INSTALL_<dir> value may be passed to the DESTINATION options of
--# install() commands for the corresponding file type. If the includer does
--# not define a value the above-shown default will be used and the value will
--# appear in the cache for editing by the user.
--# Each CMAKE_INSTALL_FULL_<dir> value contains an absolute path constructed
--# from the corresponding destination by prepending (if necessary) the value
--# of CMAKE_INSTALL_PREFIX.
--
--#=============================================================================
--# Copyright 2011 Nikita Krupen'ko <krnekit at gmail.com>
--# Copyright 2011 Kitware, Inc.
--#
--# Distributed under the OSI-approved BSD License (the "License");
--# see accompanying file Copyright.txt for details.
--#
--# This software is distributed WITHOUT ANY WARRANTY; without even the
--# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--# See the License for more information.
--#=============================================================================
--# (To distribute this file outside of CMake, substitute the full
--# License text for the above reference.)
--
--# Installation directories
--#
--if(NOT DEFINED CMAKE_INSTALL_BINDIR)
-- set(CMAKE_INSTALL_BINDIR "bin" CACHE PATH "user executables (bin)")
--endif()
--
--if(NOT DEFINED CMAKE_INSTALL_SBINDIR)
-- set(CMAKE_INSTALL_SBINDIR "sbin" CACHE PATH "system admin executables (sbin)")
--endif()
--
--if(NOT DEFINED CMAKE_INSTALL_LIBEXECDIR)
-- set(CMAKE_INSTALL_LIBEXECDIR "libexec" CACHE PATH "program executables (libexec)")
--endif()
--
--if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR)
-- set(CMAKE_INSTALL_SYSCONFDIR "etc" CACHE PATH "read-only single-machine data (etc)")
--endif()
--
--if(NOT DEFINED CMAKE_INSTALL_SHAREDSTATEDIR)
-- set(CMAKE_INSTALL_SHAREDSTATEDIR "com" CACHE PATH "modifiable architecture-independent data (com)")
--endif()
--
--if(NOT DEFINED CMAKE_INSTALL_LOCALSTATEDIR)
-- set(CMAKE_INSTALL_LOCALSTATEDIR "var" CACHE PATH "modifiable single-machine data (var)")
--endif()
--
--if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-- set(_LIBDIR_DEFAULT "lib")
-- # Override this default 'lib' with 'lib64' iff:
-- # - we are on Linux system but NOT cross-compiling
-- # - we are NOT on debian
-- # - we are on a 64 bits system
-- # reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
-- # For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
-- # CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
-- # See http://wiki.debian.org/Multiarch
-- if(CMAKE_SYSTEM_NAME MATCHES "Linux"
-- AND NOT CMAKE_CROSSCOMPILING)
-- if (EXISTS "/etc/debian_version") # is this a debian system ?
-- if(CMAKE_LIBRARY_ARCHITECTURE)
-- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
-- endif()
-- else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
-- if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
-- message(AUTHOR_WARNING
-- "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
-- "Please enable at least one language before including GNUInstallDirs.")
-- else()
-- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-- set(_LIBDIR_DEFAULT "lib64")
-- endif()
-- endif()
-- endif()
-- endif()
-- set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
--endif()
--
--if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
-- set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE PATH "C header files (include)")
--endif()
--
--if(NOT DEFINED CMAKE_INSTALL_OLDINCLUDEDIR)
-- set(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include" CACHE PATH "C header files for non-gcc (/usr/include)")
--endif()
--
--if(NOT DEFINED CMAKE_INSTALL_DATAROOTDIR)
-- set(CMAKE_INSTALL_DATAROOTDIR "share" CACHE PATH "read-only architecture-independent data root (share)")
--endif()
--
--#-----------------------------------------------------------------------------
--# Values whose defaults are relative to DATAROOTDIR. Store empty values in
--# the cache and store the defaults in local variables if the cache values are
--# not set explicitly. This auto-updates the defaults as DATAROOTDIR changes.
--
--if(NOT CMAKE_INSTALL_DATADIR)
-- set(CMAKE_INSTALL_DATADIR "" CACHE PATH "read-only architecture-independent data (DATAROOTDIR)")
-- set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}")
--endif()
--
--if(NOT CMAKE_INSTALL_INFODIR)
-- set(CMAKE_INSTALL_INFODIR "" CACHE PATH "info documentation (DATAROOTDIR/info)")
-- set(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info")
--endif()
--
--if(NOT CMAKE_INSTALL_LOCALEDIR)
-- set(CMAKE_INSTALL_LOCALEDIR "" CACHE PATH "locale-dependent data (DATAROOTDIR/locale)")
-- set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale")
--endif()
--
--if(NOT CMAKE_INSTALL_MANDIR)
-- set(CMAKE_INSTALL_MANDIR "" CACHE PATH "man documentation (DATAROOTDIR/man)")
-- set(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man")
--endif()
--
--if(NOT CMAKE_INSTALL_DOCDIR)
-- set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/PROJECT_NAME)")
-- set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}")
--endif()
--
--#-----------------------------------------------------------------------------
--
--mark_as_advanced(
-- CMAKE_INSTALL_BINDIR
-- CMAKE_INSTALL_SBINDIR
-- CMAKE_INSTALL_LIBEXECDIR
-- CMAKE_INSTALL_SYSCONFDIR
-- CMAKE_INSTALL_SHAREDSTATEDIR
-- CMAKE_INSTALL_LOCALSTATEDIR
-- CMAKE_INSTALL_LIBDIR
-- CMAKE_INSTALL_INCLUDEDIR
-- CMAKE_INSTALL_OLDINCLUDEDIR
-- CMAKE_INSTALL_DATAROOTDIR
-- CMAKE_INSTALL_DATADIR
-- CMAKE_INSTALL_INFODIR
-- CMAKE_INSTALL_LOCALEDIR
-- CMAKE_INSTALL_MANDIR
-- CMAKE_INSTALL_DOCDIR
-- )
--
--# Result directories
--#
--foreach(dir
-- BINDIR
-- SBINDIR
-- LIBEXECDIR
-- SYSCONFDIR
-- SHAREDSTATEDIR
-- LOCALSTATEDIR
-- LIBDIR
-- INCLUDEDIR
-- OLDINCLUDEDIR
-- DATAROOTDIR
-- DATADIR
-- INFODIR
-- LOCALEDIR
-- MANDIR
-- DOCDIR
-- )
-- if(NOT IS_ABSOLUTE ${CMAKE_INSTALL_${dir}})
-- set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_${dir}}")
-- else()
-- set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_${dir}}")
-- endif()
--endforeach()
diff --git a/debian/qt5keychain-dev.install b/debian/qtkeychain-qt5-dev.install
similarity index 100%
rename from debian/qt5keychain-dev.install
rename to debian/qtkeychain-qt5-dev.install
diff --git a/debian/qtkeychain-qt6-dev.install b/debian/qtkeychain-qt6-dev.install
new file mode 100644
index 0000000..1cf50ef
--- /dev/null
+++ b/debian/qtkeychain-qt6-dev.install
@@ -0,0 +1,4 @@
+usr/include/qt6keychain
+usr/lib/*/cmake/Qt6Keychain/*.cmake
+usr/lib/*/libqt6keychain.so
+usr/lib/*/qt6/mkspecs/modules/qt_Qt6Keychain.pri
diff --git a/debian/rules b/debian/rules
index d8778d3..087ebb7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,26 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
export DEB_CXXFLAGS_MAINT_APPEND = -fvisibility=hidden -fvisibility-inlines-hidden
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/architecture.mk
%:
dh $@ --with kde --with pkgkde_symbolshelper
-override_dh_missing:
- dh_missing --list-missing
+ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 arm64 armel armhf hurd-i386 i386 mips64el mipsel ppc64el riscv64))
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -rf build-Qt6
+
+override_dh_auto_configure:
+ dh_auto_configure -- -DBUILD_WITH_QT6=OFF
+ dh_auto_configure --builddirectory=build-Qt6 -- -DBUILD_WITH_QT6=ON \
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/qt6/mkspecs/modules
+
+override_dh_auto_build:
+ dh_auto_build
+ dh_auto_build --builddirectory=build-Qt6
+
+override_dh_auto_install:
+ dh_auto_install
+ dh_auto_install --builddirectory=build-Qt6
+endif
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index b7eacdb..762696d 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,3 +1,4 @@
Bug-Database: https://github.com/frankosterfeld/qtkeychain/issues
+Bug-Submit: https://github.com/frankosterfeld/qtkeychain/issues/new
Repository: https://github.com/frankosterfeld/qtkeychain.git
Repository-Browse: https://github.com/frankosterfeld/qtkeychain
diff --git a/debian/watch b/debian/watch
index b0a647e..49a639e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,7 +1,5 @@
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-version=3
+version=4
-opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/qtkeychain-$1\.tar\.gz/ \
-https://github.com/frankosterfeld/qtkeychain/tags .*/archive/v(.*).tar.gz
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz%" \
+ https://github.com/frankosterfeld/qtkeychain/tags \
+ (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate
More information about the Neon-commits
mailing list