[neon/qt6/qt6-declarative/Neon/unstable] debian: back to full doc build

[Carlos De Maine]

Git commit 45bd2b4d8e0ed5bd209fbdb59068a5438b919260 by Carlos De Maine.
Committed on 09/12/2024 at 01:00.
Pushed by carlosdem into branch 'Neon/unstable'.

back to full doc build

M  +10   -10   debian/control
M  +4    -5    debian/rules

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

diff --git a/debian/control b/debian/control
index b8d7179..34b2a11 100644
--- a/debian/control
+++ b/debian/control
@@ -14,17 +14,17 @@ Build-Depends: cmake,
                ninja-build,
                pkgconf,
                pkg-kde-tools,
-               qt6-base-dev (>=6.8.0~),
+               qt6-base-dev (>=6.8.1~),
 #               qt6-declarative-dev:native <cross>,
-               qt6-languageserver-private-dev (>=6.8.0~),
-#               qt6-location-dev,
-#               qt6-positioning-dev,
-               qt6-shadertools-dev (>=6.8.0~),
+               qt6-languageserver-private-dev (>=6.8.1~),
+               qt6-location-dev,
+               qt6-positioning-dev,
+               qt6-shadertools-dev (>=6.8.1~),
                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>,
+               qt6-tools-dev,
+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
@@ -37,7 +37,7 @@ Section: kde
 X-Neon-MergedPackage: true
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Provides: qt6-declarative-abi (=6.8.0)
+Provides: qt6-declarative-abi (=6.8.1)
 Breaks: libqt6labsanimation6,
         libqt6labsfolderlistmodel6,
         libqt6labsqmlmodels6,
diff --git a/debian/rules b/debian/rules
index 9952c7b..f41de6f 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
@@ -33,8 +33,7 @@ endif
 	dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DQT_NO_PACKAGE_VERSION_CHECK=TRUE \
-		-DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
+	dh_auto_configure -- -DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
 		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
 		-DQT_UNITY_BUILD=ON \