[neon/qt6/qt6-tools/Neon/release] debian: make it work

Carlos De Maine null at kde.org
Fri Dec 15 20:33:21 GMT 2023


Git commit 51076cfdd405ca5a2e983ea5507465c68e4bff50 by Carlos De Maine.
Committed on 15/12/2023 at 17:50.
Pushed by carlosdem into branch 'Neon/release'.

make it work

M  +4    -4    debian/control
M  +1    -1    debian/qt6-tools-doc.install
M  +11   -11   debian/rules

https://invent.kde.org/neon/qt6/qt6-tools/-/commit/51076cfdd405ca5a2e983ea5507465c68e4bff50

diff --git a/debian/control b/debian/control
index 830da95..09d699b 100644
--- a/debian/control
+++ b/debian/control
@@ -23,9 +23,9 @@ Build-Depends: clang,
                pkg-kde-tools,
                qt6-base-dev (>= 6.6.1~),
                qt6-declarative-dev (>= 6.6.1~)
-#Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!neon_nodoc>,
-#                     qt6-base-doc (>= 6.6~) <!neon_nodoc>,
-#                     qt6-documentation-tools (>= 6.6~) <!neon_nodoc>,
+Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
+                     qt6-base-doc (>= 6.6~) <!nodoc>,
+                     qt6-documentation-tools (>= 6.6~) <!nodoc>,
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-tools
@@ -86,7 +86,7 @@ Description: Qt 6 Tools - development files
  applications.
 
 Package: qt6-tools-doc
-Build-Profiles: <!neon_nodoc>
+Build-Profiles: <!nodoc>
 Architecture: all
 Section: kde
 X-Neon-MergedPackage: true
diff --git a/debian/qt6-tools-doc.install b/debian/qt6-tools-doc.install
index d22b0e0..6a0b95c 100644
--- a/debian/qt6-tools-doc.install
+++ b/debian/qt6-tools-doc.install
@@ -1 +1 @@
-#usr/share/qt6/doc
+usr/share/qt6/doc
diff --git a/debian/rules b/debian/rules
index 2c37b86..68f33af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,22 +29,22 @@ override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
 
 ## attention to the negation
-ifneq ($(filter neon_nodoc,$(DEB_BUILD_PROFILES)),)
-#override_dh_auto_build-indep:
-	dh_auto_build -- docs
+#ifneq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
+override_dh_auto_build-indep:
+dh_auto_build -- docs
 
-#override_dh_auto_install-indep:
-#	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install_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 \
+	find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
                 sed -i 's@$(CURDIR)/@@g' {} \;
 #else
-override_dh_auto_build-indep:
-	dh_auto_build
+#override_dh_auto_build-indep:
+#	dh_auto_build
 
-override_dh_auto_install-indep:
-	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
-endif
+#override_dh_auto_install-indep:
+#	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
+#endif
 
 execute_after_dh_auto_install-arch:
 	# Reproducible builds: remove build paths from .prl files


More information about the Neon-commits mailing list