[neon/qt6/qt6-declarative/Neon/release] debian: Revert "full bootstrap doc rebuild"

Carlos De Maine null at kde.org
Sun Dec 8 03:27:54 GMT 2024


Git commit dd54aed8caf908e0af13e2ab1ef8538362a29d9a by Carlos De Maine.
Committed on 08/12/2024 at 03:27.
Pushed by carlosdem into branch 'Neon/release'.

Revert "full bootstrap doc rebuild"

This reverts commit 3578a2a75c33f393828b95e4b03146af7b28c022.

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

https://invent.kde.org/neon/qt6/qt6-declarative/-/commit/dd54aed8caf908e0af13e2ab1ef8538362a29d9a

diff --git a/debian/control b/debian/control
index b5ef419..98fb824 100644
--- a/debian/control
+++ b/debian/control
@@ -22,9 +22,9 @@ Build-Depends: cmake,
                qt6-shadertools-dev (>=6.8.0~),
                qt6-svg-dev,
                qt6-tools-dev,
-#Build-Depends-Indep: qt6-base-dev (>=6.8~) <!nodoc>,
-#                     qt6-base-doc (>=6.8~) <!nodoc>,
-#                     qt6-documentation-tools (>=6.8~) <!nodoc>,
+Build-Depends-Indep: qt6-base-dev (>=6.8~) <!nodoc>,
+                     qt6-base-doc (>=6.8~) <!nodoc>,
+                     qt6-documentation-tools (>=6.8~) <!nodoc>,
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-declarative.git
diff --git a/debian/qt6-declarative-doc.install b/debian/qt6-declarative-doc.install
index 36c01e0..8536ff4 100644
--- a/debian/qt6-declarative-doc.install
+++ b/debian/qt6-declarative-doc.install
@@ -1 +1 @@
-#usr/share/qt6/doc/
+usr/share/qt6/doc/
diff --git a/debian/rules b/debian/rules
index 9952c7b..6046f27 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,12 +6,12 @@ include /usr/share/dpkg/architecture.mk
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
 #### uncomment when bootstrapping a new qt release ####
-DEB_BUILD_PROFILES="nodoc"
-export DEB_BUILD_PROFILES
+#DEB_BUILD_PROFILES="nodoc"
+#export DEB_BUILD_PROFILES
 
 # 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