[neon/qt6/qt6-base/Neon/stable] debian: Revert "full bootstrap nodoc rebuild for stable"

Carlos De Maine null at kde.org
Sat Dec 7 10:36:16 GMT 2024


Git commit 162627ea049002bf882a3eacd89bb623b655175a by Carlos De Maine.
Committed on 07/12/2024 at 10:36.
Pushed by carlosdem into branch 'Neon/stable'.

Revert "full bootstrap nodoc rebuild for stable"

This reverts commit 9d88f6ee5bb52af878f820f5b3fa5136ce9697e7

(cherry picked from commit 7e3a6b3756702d9d2b26b987ba490b5bce1a292b)

Co-authored-by: Carlos De Maine <carlosd.kde at gmail.com>

M  +3    -3    debian/control
M  +1    -1    debian/qt6-base-doc.install
M  +1    -1    debian/rules

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

diff --git a/debian/control b/debian/control
index c2ffd1c..eee05e8 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.8~) <!nodoc>,
-#                    qt6-documentation-tools (>=6.8~) <!nodoc>,
-#                    qt6-base-doc (>=6.8~) <!nodoc>,
+Build-Depends-Indep: qt6-base-dev (>=6.8~) <!nodoc>,
+                    qt6-documentation-tools (>=6.8~) <!nodoc>,
+                    qt6-base-doc (>=6.8~) <!nodoc>,
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Rules-Requires-Root: no
diff --git a/debian/qt6-base-doc.install b/debian/qt6-base-doc.install
index 164be57..1379c86 100644
--- a/debian/qt6-base-doc.install
+++ b/debian/qt6-base-doc.install
@@ -1 +1 @@
-#usr/share/qt6/doc/q*
+usr/share/qt6/doc/q*
diff --git a/debian/rules b/debian/rules
index 8a11dc6..c21fb57 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ sslpkgname := $(shell dpkg-query --show '--showformat=$${Depends}' libssl-dev |
 
 # the next statement obviously has to have inverted logic (ifneq instad of ifeq) to work
 # for a nodoc build as nodoc is not being added to DEB_BUILD_PROFILES for some reason
-ifneq (,$(filter nodoc,$(DEB_BUILD_PROFILES)),)
+ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)),)
 	extra_build_args +=
 	extra_install_args +=
 	build_docs += false


More information about the Neon-commits mailing list