[neon/qt6/qt6-webchannel/Neon/release] debian: align to debian

Carlos De Maine null at kde.org
Tue Oct 24 00:24:33 BST 2023


Git commit 6873f3edf373bd5b63eae5ff7fc3622e4743e99a by Carlos De Maine.
Committed on 24/10/2023 at 01:23.
Pushed by carlosdem into branch 'Neon/release'.

align to debian

M  +41   -1    debian/control
A  +1    -0    debian/qt6-webchannel-doc.install
M  +10   -1    debian/rules

https://invent.kde.org/neon/qt6/qt6-webchannel/-/commit/6873f3edf373bd5b63eae5ff7fc3622e4743e99a

diff --git a/debian/control b/debian/control
index 2acc995..d9a2a98 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,10 @@ Build-Depends: cmake,
                qt6-base-dev (>= 6.4.2+dfsg~),
                qt6-declarative-dev (>= 6.4.2+dfsg~),
                qt6-websockets-dev (>= 6.4.2~)
-Standards-Version: 4.6.1
+Build-Depends-Indep: qt6-base-dev (>= 6.4~) <!nodoc>,
+                     qt6-documentation-tools (>= 6.4~) <!nodoc>,
+                     qt6-base-doc (>= 6.4~) <!nodoc>,
+Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-webchannel
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-webchannel.git
@@ -61,6 +64,25 @@ Description: Qt 6 WebChannel library - development files
  This package contains the development files needed to build Qt 6 applications
  using the QtWebChannel library.
 
+Package: qt6-webchannel-dev
+Architecture: all
+Section: kde
+X-Neon-MergedPackage: true
+Depends: qt6-base-doc,
+         qt6-webchannel-dev (= ${binary:Version}),
+         ${misc:Depends}
+Description: Qt 6 WebChannel library - documentation files
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ Qt WebChannel enables peer-to-peer communication between the host (QML/C++
+ application) and the client (HTML/JavaScript application). The transport
+ mechanism is supported out of the box by the two popular web engines, Qt
+ WebKit 2 and Qt WebEngine.
+ .
+ This package contains the documentation to help build Qt 6 applications
+ using the QtWebChannel library.
+
 Package: libqt6webchannel6
 Architecture: all
 Depends: qt6-webchannel
@@ -78,3 +100,21 @@ Architecture: all
 Depends: qt6-webchannel
 Description: Dummy transitional
  Transitional dummy package.
+
+Package: qt6-webchannel-doc-dev
+Architecture: all
+Depends: qt6-webchannel-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-webchannel-doc-html
+Architecture: all
+Depends: qt6-webchannel-doc
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-webchannel-exmaples
+Architecture: all
+Depends: qt6-webchannel-dev
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/qt6-webchannel-doc.install b/debian/qt6-webchannel-doc.install
new file mode 100644
index 0000000..5829e83
--- /dev/null
+++ b/debian/qt6-webchannel-doc.install
@@ -0,0 +1 @@
+usr/lib/qt6/doc/
diff --git a/debian/rules b/debian/rules
index 89e1536..dba1943 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,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