[neon/qt6/qt6-base/Neon/release] debian: doc build

Carlos De Maine null at kde.org
Thu Oct 24 22:15:16 BST 2024


Git commit 0cd58c4180b35b50f78a3040a3cf2a18aefc2d0a by Carlos De Maine.
Committed on 24/10/2024 at 21:15.
Pushed by carlosdem into branch 'Neon/release'.

doc build

M  +4    -5    debian/control
M  +1    -1    debian/qt6-base-doc.install
M  +11   -11   debian/rules

https://invent.kde.org/neon/qt6/qt6-base/-/commit/0cd58c4180b35b50f78a3040a3cf2a18aefc2d0a

diff --git a/debian/control b/debian/control
index 65de565..ae6ea92 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.8~) <!nodoc>,
-                     qt6-documentation-tools (>= 6.8~) <!nodoc>,
-                     qt6-base-doc (>= 6.8~) <!nodoc>,
+#Build-Depends-Indep: qt6-base-dev (>=6.8~) <!nodoc>,
+#                    qt6-documentation-tools (>=6.8~) <!nodoc>,
+#                    qt6-base-doc (>=6.8~) <!nodoc>,
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Rules-Requires-Root: no
@@ -119,7 +119,7 @@ Depends: fontconfig,
          shared-mime-info,
          ${misc:Depends},
          ${shlibs:Depends}
-Provides: qt6-base-private-abi (= 6.7.0),
+Provides: qt6-base-private-abi (=6.8.0),
 Recommends: libcups2,
             libqt6sql6-sqlite | libqt6sql6-mysql | libqt6sql6-odbc | libqt6sql6-psql | libqt6sql6-ibase,
             qt6-gtk-platformtheme,
@@ -501,4 +501,3 @@ Architecture: all
 Depends: qt6-base, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
-
diff --git a/debian/qt6-base-doc.install b/debian/qt6-base-doc.install
index 8536ff4..36c01e0 100644
--- a/debian/qt6-base-doc.install
+++ b/debian/qt6-base-doc.install
@@ -1 +1 @@
-usr/share/qt6/doc/
+#usr/share/qt6/doc/
diff --git a/debian/rules b/debian/rules
index 20d24bb..5b91bc9 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
-	# Remove build path from index files.
-	find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
-                sed -i 's@$(CURDIR)/@@g' {} \;
+	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
 
 ### no longer needed??


More information about the Neon-commits mailing list