[neon/qt6/qt6-base/Neon/unstable] debian: Revert "no doc bootstrap build"
Carlos De Maine
null at kde.org
Tue Sep 3 12:33:04 BST 2024
Git commit 7ff2261fb8d2c9c7798b34fc7e81e543e6a694f4 by Carlos De Maine.
Committed on 03/09/2024 at 11:33.
Pushed by carlosdem into branch 'Neon/unstable'.
Revert "no doc bootstrap build"
This reverts commit d8d39566cb08b3685d3378a0504118fa17f42572
M +3 -3 debian/control
M +10 -10 debian/rules
https://invent.kde.org/neon/qt6/qt6-base/-/commit/7ff2261fb8d2c9c7798b34fc7e81e543e6a694f4
diff --git a/debian/control b/debian/control
index 0533282..aeb0713 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 4ac8abe..20d24bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -122,20 +122,20 @@ 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
+# 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' {} \;
+ find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
+ sed -i 's@$(CURDIR)/@@g' {} \;
#endif
### no longer needed??
More information about the Neon-commits
mailing list