[neon/qt6/qt6-base/Neon/release_jammy] debian: Revert "bootstrap build"
Carlos De Maine
null at kde.org
Fri Jul 26 07:46:16 BST 2024
Git commit 1f4250c8e252b83c46ccfbf5aae978d87486b699 by Carlos De Maine.
Committed on 26/07/2024 at 06:46.
Pushed by carlosdem into branch 'Neon/release_jammy'.
Revert "bootstrap build"
This reverts commit ff4e71d59c0a2cfb6d882d3aee493a344c6bdae6.
M +3 -3 debian/control
M +10 -10 debian/rules
https://invent.kde.org/neon/qt6/qt6-base/-/commit/1f4250c8e252b83c46ccfbf5aae978d87486b699
diff --git a/debian/control b/debian/control
index 7fa3c9d..b2f557d 100644
--- a/debian/control
+++ b/debian/control
@@ -104,9 +104,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
Section: libs
Homepage: https://www.qt.io/developers/
diff --git a/debian/rules b/debian/rules
index d6e501f..c16e40c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -126,19 +126,19 @@ 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
-# # Remove build path from index files.
-# find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
+# 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' {} \;
#endif
More information about the Neon-commits
mailing list