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

[Carlos De Maine]

Git commit be7f860f3e94cc4ce7eca60ed2773acaf7af07ec by Carlos De Maine.
Committed on 24/10/2023 at 00:57.
Pushed by carlosdem into branch 'Neon/release'.

align to debian

M  +27   -1    debian/control
A  +1    -0    debian/qt6-image-formats-plugins.install
A  +1    -0    debian/qt6-imageformats-doc.install
M  +17   -4    debian/rules

https://invent.kde.org/neon/qt6/qt6-imageformats/-/commit/be7f860f3e94cc4ce7eca60ed2773acaf7af07ec

diff --git a/debian/control b/debian/control
index 3e49eda..ccb568e 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,10 @@ Build-Depends: cmake (>= 3.18~),
                pkg-config,
                qt6-base-dev (>= 6.4.2+dfsg~),
                qt6-base-private-dev (>= 6.4.2+dfsg~)
-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/
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-imageformats.git
@@ -24,6 +27,8 @@ Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-imageformats
 
 Package: qt6-image-formats-plugins
 Architecture: any
+X-Neon-MergedPackage: true
+Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: qt6-base-dev, ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 6 Image Formats plugins
@@ -32,3 +37,24 @@ Description: Qt 6 Image Formats plugins
  .
  This package contains plugins for adding support for ICNS, MNG, TGA, TIFF,
  WBMP and WEBP image formats.
+
+Package: qt6-imageformats-doc
+Architecture: any
+X-Neon-MergedPackage: true
+Multi-Arch: same
+Depends: qt6-base-doc,
+         qt6-imageformats (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Multi-Arch: foreign
+Description: Qt 6 image formats 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 the documentation for the Qt 6 image formats plugins.
+
+Package: qt6-imageformats-doc-html
+Architecture: all
+Depends: qt6-imageformats-doc
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/qt6-image-formats-plugins.install b/debian/qt6-image-formats-plugins.install
new file mode 100644
index 0000000..b8c0627
--- /dev/null
+++ b/debian/qt6-image-formats-plugins.install
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/imageformats/
diff --git a/debian/qt6-imageformats-doc.install b/debian/qt6-imageformats-doc.install
new file mode 100644
index 0000000..8536ff4
--- /dev/null
+++ b/debian/qt6-imageformats-doc.install
@@ -0,0 +1 @@
+usr/share/qt6/doc/
diff --git a/debian/rules b/debian/rules
index 8b89630..f11dc62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,12 @@
 #!/usr/bin/make -f
-
-# Use already defined DEB_HOST_* variables.
 include /usr/share/dpkg/architecture.mk
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
+
+# QT_HOST_PATH isn't passed in cross-builds
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+	extra_cmake_args += -DQT_HOST_PATH=/usr
+endif
 
 %:
 	dh $@ --buildsystem=cmake+ninja
@@ -11,4 +14,14 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		--log-level=STATUS \
-		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+		-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' {} \;