[neon/qt6/qt6-tools/Neon/release] debian: Revert "back to proper build"

Carlos De Maine null at kde.org
Tue Apr 30 02:00:37 BST 2024


Git commit 8259c7106e1dded9de7696dac9e27ffcc4481e7c by Carlos De Maine.
Committed on 30/04/2024 at 01:00.
Pushed by carlosdem into branch 'Neon/release'.

Revert "back to proper build"

This reverts commit 61b1b6b518ed87d383111ab3baac2132f096273f.

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

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

diff --git a/debian/control b/debian/control
index b38afbb..ba0f03b 100644
--- a/debian/control
+++ b/debian/control
@@ -21,9 +21,9 @@ Build-Depends: clang,
                pkg-kde-tools,
                qt6-base-dev (>= 6.7.0~),
                qt6-declarative-dev (>= 6.7.0~)
-Build-Depends-Indep: qt6-base-dev (>= 6.7~) <!nodoc>,
-                     qt6-base-doc (>= 6.7~) <!nodoc>,
-                     qt6-documentation-tools (>= 6.7~) <!nodoc>,
+#Build-Depends-Indep: qt6-base-dev (>= 6.7~) <!nodoc>,
+#                     qt6-base-doc (>= 6.7~) <!nodoc>,
+#                     qt6-documentation-tools (>= 6.7~) <!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 c595488..e38a284 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,21 +24,21 @@ override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
 
 ## attention to the negation
-ifneq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
-override_dh_auto_build-indep:
-	dh_auto_build -- docs
+#ifneq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
+#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 \
+#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' {} \;
 #else
-#override_dh_auto_build-indep:
-#	dh_auto_build
-#
-#override_dh_auto_install-indep:
-#	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
+override_dh_auto_build-indep:
+	dh_auto_build
+
+override_dh_auto_install-indep:
+	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
 #endif
 
 execute_after_dh_auto_install-arch:


More information about the Neon-commits mailing list