[neon/forks/qtkeychain/Neon/unstable] debian: Revert "no qt6 yet"

Carlos De Maine null at kde.org
Wed May 10 07:33:42 BST 2023


Git commit ac05c14fa9da36e86917a10ffe7547e50e447ffa by Carlos De Maine.
Committed on 10/05/2023 at 06:33.
Pushed by carlosdem into branch 'Neon/unstable'.

Revert "no qt6 yet"

This reverts commit 9a0d7f091cab5468f928484a0ab33db9e9bc9811

M  +31   -0    debian/control
M  +4    -0    debian/rules

https://invent.kde.org/neon/forks/qtkeychain/commit/ac05c14fa9da36e86917a10ffe7547e50e447ffa

diff --git a/debian/control b/debian/control
index 04bef6f..31c5c37 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,10 @@ Build-Depends: cmake,
                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,
@@ -33,6 +37,19 @@ Description: Qt API to store passwords (QT5 version)
  .
  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
@@ -56,3 +73,17 @@ Description: Development files for qtkeychain (QT5 version)
  with explicit request the password unencrypted at a file.
  .
  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/rules b/debian/rules
index d1e2d03..087ebb7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,10 +19,14 @@ override_dh_auto_clean:
 
 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


More information about the Neon-commits mailing list