[neon/qt6/qt6-webengine/Neon/release] debian: Match debian and don't do arch indep. Seems there is a reason why.

Scarlett Moore null at kde.org
Wed Oct 25 16:48:37 BST 2023


Git commit ce62e6f25f75b9cc67584721773616b41b22cae6 by Scarlett Moore.
Committed on 25/10/2023 at 17:47.
Pushed by scarlettmoore into branch 'Neon/release'.

Match debian and don't do arch indep. Seems there is a reason why.

M  +2    -3    debian/control
M  +4    -7    debian/rules

https://invent.kde.org/neon/qt6/qt6-webengine/-/commit/ce62e6f25f75b9cc67584721773616b41b22cae6

diff --git a/debian/control b/debian/control
index 4b0d25f..334e22e 100644
--- a/debian/control
+++ b/debian/control
@@ -99,9 +99,8 @@ Build-Depends: binutils (>= 2.32-8~),
                xauth <!nocheck>,
                xvfb <!nocheck>,
                zlib1g-dev,
-Build-Depends-Indep: qt6-base-dev (>= 6.4~) <!nodoc>,
-                     qt6-documentation-tools (>= 6.4~) <!nodoc>,
-                     qt6-base-doc (>= 6.4~) <!nodoc>,
+               qt6-documentation-tools (>= 6.4~) <!nodoc>,
+               qt6-base-doc (>= 6.4~) <!nodoc>,
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-webengine
diff --git a/debian/rules b/debian/rules
index 7573de9..a39dc52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,18 +83,15 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	dh_auto_build
-
-override_dh_auto_build-indep:
 	dh_auto_build -- docs
 
-override_dh_auto_install-indep:
+execute_after_dh_auto_install:
+	# Reproducible builds: remove build paths from .prl files
+	sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt6*.prl
+	# Install documentation.
 	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install_docs
 	# Remove build path from index files.
 	find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
                sed -i 's@$(CURDIR)/@@g' {} \;
 
-execute_after_dh_auto_install:
-	# Reproducible builds: remove build paths from .prl files
-	sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt6*.prl
-
 override_dh_dwz:


More information about the Neon-commits mailing list