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

Carlos De Maine null at kde.org
Mon Oct 23 03:50:19 BST 2023


Git commit 5864c5c05c614d9d81c6c45ea151701ff8d897b2 by Carlos De Maine.
Committed on 23/10/2023 at 04:41.
Pushed by carlosdem into branch 'Neon/release'.

align to debian

M  +29   -1    debian/control
A  +1    -0    debian/qt6-httpserver-doc.install
M  +9    -1    debian/rules

https://invent.kde.org/neon/qt6/qt6-httpserver/-/commit/5864c5c05c614d9d81c6c45ea151701ff8d897b2

diff --git a/debian/control b/debian/control
index af0bd68..2de3e2d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,9 @@ Build-Depends: cmake,
                pkg-kde-tools,
                qt6-base-dev,
                qt6-websockets-dev,
+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-httpserver
@@ -39,8 +42,33 @@ Description: Qt 6 HTTP Server library
  .
  This package contains Qt 6 HTTP Server library.
 
+Package: qt6-httpserver-doc
+Architecture: all
+Section: kde
+X-Neon-MergedPackage: true
+Depends: qt6-base-doc,
+         qt6-httpserver-dev (= ${binary:Version}),
+         ${misc:Depends}
+Description: Qt 6 HTTP Server documentation
+ 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 Qt 6 HTTP Server documentation.
+
 Package: libqt6httpserver6
 Architecture: any
-Depends: qt6-httpserver (= ${binary:Version}), ${misc:Depends}
+Depends: qt6-httpserver
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-httpserver-examples
+Architecture: all
+Depends: qt6-httpserver-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-httpserver-doc-html
+Architecture: all
+Depends: qt6-httpserver-doc
 Description: Dummy transitional
  Transitional dummy package.
diff --git a/debian/qt6-httpserver-doc.install b/debian/qt6-httpserver-doc.install
new file mode 100644
index 0000000..8536ff4
--- /dev/null
+++ b/debian/qt6-httpserver-doc.install
@@ -0,0 +1 @@
+usr/share/qt6/doc/
diff --git a/debian/rules b/debian/rules
index 770205b..a15fef7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-
 include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
@@ -18,6 +17,15 @@ override_dh_auto_configure:
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
 		$(extra_cmake_args)
 
+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:
 	# 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