[neon/qt6/qt6-base/Neon/release] debian: Revert "bootstrap build"

Carlos De Maine null at kde.org
Fri Jul 26 07:46:04 BST 2024


Git commit f84e4daee662a2f6fb19abc79c0a5a85df79068e by Carlos De Maine.
Committed on 26/07/2024 at 06:45.
Pushed by carlosdem into branch 'Neon/release'.

Revert "bootstrap build"

This reverts commit a2e4f41a6d68238b9a0232f7c9e0e6032e3139a0.

M  +3    -3    debian/control
M  +11   -11   debian/rules

https://invent.kde.org/neon/qt6/qt6-base/-/commit/f84e4daee662a2f6fb19abc79c0a5a85df79068e

diff --git a/debian/control b/debian/control
index d1f10e8..4cc3cd6 100644
--- a/debian/control
+++ b/debian/control
@@ -101,9 +101,9 @@ Build-Depends: cmake,
                shared-mime-info,
                unixodbc-dev,
                zlib1g-dev,
-#Build-Depends-Indep: qt6-base-dev (>= 6.7~) <!nodoc>,
-#                     qt6-documentation-tools (>= 6.7~) <!nodoc>,
-#                     qt6-base-doc (>= 6.7~) <!nodoc>,
+Build-Depends-Indep: qt6-base-dev (>= 6.7~) <!nodoc>,
+                     qt6-documentation-tools (>= 6.7~) <!nodoc>,
+                     qt6-base-doc (>= 6.7~) <!nodoc>,
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Rules-Requires-Root: no
diff --git a/debian/rules b/debian/rules
index c78b697..20d24bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -122,19 +122,19 @@ execute_after_dh_auto_install-arch:
 		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6CoreTools/Qt6CoreToolsTargets-relwithdebinfo.cmake
 
 #ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
-override_dh_auto_build-indep:
-	dh_auto_build
-
-override_dh_auto_install-indep:
-	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
-#else
 #override_dh_auto_build-indep:
-#	dh_auto_build -- docs
+#	dh_auto_build
 
 #override_dh_auto_install-indep:
-#	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 \
+#	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
+#else
+override_dh_auto_build-indep:
+	dh_auto_build -- docs
+
+override_dh_auto_install-indep:
+	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' {} \;
 #endif
 
@@ -143,4 +143,4 @@ override_dh_makeshlibs:
 	dh_makeshlibs -XlibQt6EglFSDeviceIntegration -XlibQt6EglFsKmsGbmSupport -XlibQt6EglFsKmsSupport -XlibQt6XcbQpa
 
 execute_after_dh_shlibdeps-arch:
-	echo libssl:Depends=$(sslpkgname) >> debian/libqt6network6.substvars
\ No newline at end of file
+	echo libssl:Depends=$(sslpkgname) >> debian/libqt6network6.substvars


More information about the Neon-commits mailing list