[neon/qt6/qt6-tools/Neon/release] debian: bootstrap

Carlos De Maine null at kde.org
Wed Dec 13 05:45:16 GMT 2023


Git commit e5c0c24542261549bd8e018fb1d9100bad60e634 by Carlos De Maine.
Committed on 13/12/2023 at 06:43.
Pushed by carlosdem into branch 'Neon/release'.

bootstrap

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

https://invent.kde.org/neon/qt6/qt6-tools/-/commit/e5c0c24542261549bd8e018fb1d9100bad60e634

diff --git a/debian/control b/debian/control
index d4fdce7..0263333 100644
--- a/debian/control
+++ b/debian/control
@@ -26,9 +26,9 @@ Build-Depends: clang-14,
                pkg-kde-tools,
                qt6-base-dev (>= 6.6.1~),
                qt6-declarative-dev (>= 6.6.1~)
-Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
-                     qt6-base-doc (>= 6.6~) <!nodoc>,
-                     qt6-documentation-tools (>= 6.6~) <!nodoc>,
+#Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
+#                     qt6-base-doc (>= 6.6~) <!nodoc>,
+#                     qt6-documentation-tools (>= 6.6~) <!nodoc>,
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-tools
diff --git a/debian/qt6-tools-doc.install b/debian/qt6-tools-doc.install
index 6a0b95c..d22b0e0 100644
--- a/debian/qt6-tools-doc.install
+++ b/debian/qt6-tools-doc.install
@@ -1 +1 @@
-usr/share/qt6/doc
+#usr/share/qt6/doc
diff --git a/debian/rules b/debian/rules
index e735ea9..f3357e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,8 @@ include /usr/share/dpkg/architecture.mk
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
 ### uncomment when bootstrapping a new qt release
-DEB_BUILD_OPTIONS := ${DEB_BUILD_OPTIONS} nodoc
-DEB_BUILD_PROFILES := ${DEB_BUILD_PROFILES} nodoc
+#export DEB_BUILD_OPTIONS := ${DEB_BUILD_OPTIONS} nodoc
+#export DEB_BUILD_PROFILES := ${DEB_BUILD_PROFILES} nodoc
 
 
 # need gcc 12.1 for mold to be able to process --gdb-index
@@ -30,26 +30,26 @@ override_dh_shlibdeps:
 
 override_dh_auto_build-indep:
 # support the nodoc build profile
-ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
-	echo -e "\nnodoc build profile enabled, therefore not building docs.\n"
+#ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
+#	echo -e "\nnodoc build profile enabled, therefore not building docs.\n"
 	dh_auto_build
-else
-	echo -e "\nnodoc build profile not enabled, therefore building docs.\n"
-	dh_auto_build -- docs
-endif
+#else
+#	echo -e "\nnodoc build profile not enabled, therefore building docs.\n"
+#	dh_auto_build -- docs
+#endif
 
 override_dh_auto_install-indep:
 # support the nodoc build profile
-ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
-	echo -e "\nnodoc build profile enabled, therefore not installing docs.\n"
+#ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
+#	echo -e "\nnodoc build profile enabled, therefore not installing docs.\n"
 	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
-else
-	echo -e "\nnodoc build profile enabled, therefore installing docs.\n"
-	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 \
+#else
+#	echo -e "\nnodoc build profile enabled, therefore installing docs.\n"
+#	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
+#endif
 
 execute_after_dh_auto_install-arch:
 	# Reproducible builds: remove build paths from .prl files


More information about the Neon-commits mailing list