[neon/forks/qtkeychain/Neon/release] debian: no qt6 yet

Jonathan Esk-Riddell null at kde.org
Thu Sep 8 17:26:32 BST 2022


Git commit 9a0d7f091cab5468f928484a0ab33db9e9bc9811 by Jonathan Esk-Riddell.
Committed on 08/09/2022 at 16:26.
Pushed by jriddell into branch 'Neon/release'.

no qt6 yet

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

https://invent.kde.org/neon/forks/qtkeychain/commit/9a0d7f091cab5468f928484a0ab33db9e9bc9811

diff --git a/debian/control b/debian/control
index 31c5c37..04bef6f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,10 +8,6 @@ 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,
@@ -37,19 +33,6 @@ 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
@@ -73,17 +56,3 @@ 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 087ebb7..d1e2d03 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,14 +19,10 @@ 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