[neon/qt6/qt6-5compat/Neon/release] debian: sync to debian

Carlos De Maine null at kde.org
Tue Oct 24 11:17:12 BST 2023


Git commit f15c1e7682b6807670621c47b070a01b349c2ed9 by Carlos De Maine.
Committed on 24/10/2023 at 12:17.
Pushed by carlosdem into branch 'Neon/release'.

sync to debian

M  +18   -1    debian/control
A  +1    -0    debian/qt6-5compat-doc.install
M  +10   -1    debian/rules

https://invent.kde.org/neon/qt6/qt6-5compat/-/commit/f15c1e7682b6807670621c47b070a01b349c2ed9

diff --git a/debian/control b/debian/control
index f4422e1..bfc1d2a 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends: cmake,
                qt6-base-dev (>= 6.4.2+dfsg~),
                qt6-declarative-dev (>= 6.4.2+dfsg~),
                qt6-shadertools-dev (>= 6.4.2~)
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-5compat
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-5compat.git
@@ -49,6 +49,18 @@ Description: Qt 6 Qt5Compat - development files
  This package contains the development files needed to build Qt 6 applications
  using the Core5Compat library.
 
+Package: qt6-5compat-doc
+Architecture: all
+Section: kde
+X-Neon-MergedPackage: true
+Depends: qt6-5compat-dev (= ${binary:Version}), qt6-base-doc, ${misc:Depends}
+Description: Qt 6 Qt5Compat - development files
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the d files documentation to help build Qt 6 applications
+ using the Core5Compat library.
+
 Package: libqt6core5compat6
 Architecture: all
 Depends: qt6-5compat
@@ -66,3 +78,8 @@ Architecture: all
 Depends: qt6-5compat
 Description: Dummy transitional
  Transitional dummy package.
+
+Package: qt6-5compat-doc-html
+Architecture: all
+Depends: qt6-5compat-doc
+Description: Dummy transitional
diff --git a/debian/qt6-5compat-doc.install b/debian/qt6-5compat-doc.install
new file mode 100644
index 0000000..8536ff4
--- /dev/null
+++ b/debian/qt6-5compat-doc.install
@@ -0,0 +1 @@
+usr/share/qt6/doc/
diff --git a/debian/rules b/debian/rules
index 847a60b..b8d06c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,15 @@ override_dh_auto_configure:
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
 		$(extra_cmake_args)
 
-execute_after_dh_auto_install:
+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' {} \;
+
+execute_after_dh_auto_install-arch:
 	# Reproducible builds: remove build paths from .prl files
 	sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt6*.prl


More information about the Neon-commits mailing list