[neon/backports-jammy/gpgme/Neon/unstable] debian: make it a fancy schwancy double build because qt5 and qt6 can't be built in the same dir

Carlos De Maine null at kde.org
Tue May 16 02:24:27 BST 2023


Git commit 7952de584bab8dab8d49203b56a17e1c19f94132 by Carlos De Maine.
Committed on 16/05/2023 at 01:24.
Pushed by carlosdem into branch 'Neon/unstable'.

make it a fancy schwancy double build because qt5 and qt6 can't be built in the same dir

M  +3    -1    debian/libgpgmepp-dev.install
M  +1    -0    debian/libqgpgme15.install
M  +30   -12   debian/rules

https://invent.kde.org/neon/backports-jammy/gpgme/commit/7952de584bab8dab8d49203b56a17e1c19f94132

diff --git a/debian/libgpgmepp-dev.install b/debian/libgpgmepp-dev.install
index 8103992f..fe05541a 100644
--- a/debian/libgpgmepp-dev.install
+++ b/debian/libgpgmepp-dev.install
@@ -4,5 +4,7 @@ usr/include/qgpgme
 usr/lib/*/cmake
 usr/lib/*/libgpgmepp.a
 usr/lib/*/libgpgmepp.so
+usr/lib/*/libqgpgme.a
+usr/lib/*/libqgpgme.so
 usr/lib/*/libqgpgmeqt6.a
-usr/lib/*/libqgpgmeqt6.so
+usr/lib/*/libqgpgmeqt6.so
\ No newline at end of file
diff --git a/debian/libqgpgme15.install b/debian/libqgpgme15.install
index d869ce13..a369c506 100644
--- a/debian/libqgpgme15.install
+++ b/debian/libqgpgme15.install
@@ -1 +1,2 @@
+usr/lib/*/libqgpgme.so.*
 usr/lib/*/libqgpgmeqt6.so.*
diff --git a/debian/rules b/debian/rules
index 224cd842..78e3a39b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export QT_SELECT := qt6
 
 include /usr/share/dpkg/architecture.mk
 
@@ -12,25 +11,44 @@ ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 endif
 
 %:
-	dh $@ --builddirectory=build-qt6 --with python3
+	dh $@ --with python3
+	
+execute_after_dh_auto_clean:
+	rm -rf build-qt6
+	rm -rf build-qt5
 
 override_dh_auto_configure:
-	dh_auto_configure --builddirectory=build-qt6 -- \
-	    --enable-static \
-	    --enable-languages="python cpp qt6" \
-	    --infodir=/usr/share/info
+	dh_auto_configure --builddirectory=build-qt6 --enable-static --enable-languages="python cpp qt6" --infodir=/usr/share/info
+	dh_auto_configure --builddirectory=build-qt5 --enable-static --enable-languages="qt5" --infodir=/usr/share/info
+
+override_dh_auto_build:
+	dh_auto_build --builddirectory=build-qt6
+	dh_auto_build --builddirectory=build-qt5
+
+override_dh_auto_install:
+	dh_auto_install --builddirectory=build-qt6
+	dh_auto_install --builddirectory=build-qt5
 
 override_dh_missing:
 	dh_missing -X.la -Xinfo/dir -X.pyc -Xinstall_files.txt -X__pycache__ -Xgpgme-json
-
-override_dh_auto_test:
-ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS)))
-	dh_auto_test
-	./debian/tests/checky2106 || true
-endif
+	dh_missing -X.la -Xinfo/dir -X.pyc -Xinstall_files.txt -X__pycache__ -Xgpgme-json
 
 override_dh_makeshlibs:
 	dh_makeshlibs -V
+	dh_makeshlibs -V
 
 override_dh_installdocs:
 	dh_installdocs -X.md5
+	dh_installdocs -X.md5
+
+
+
+
+
+
+
+
+
+override_dh_auto_test:
+	dh_auto_test --no-parallel
+	dh_auto_test --no-parallel --builddirectory=build-Qt6


More information about the Neon-commits mailing list