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

[Carlos De Maine]

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

align to debian

M  +35   -1    debian/control
M  +0    -4    debian/not-installed
M  +1    -4    debian/qt6-charts.install
M  +17   -2    debian/rules

https://invent.kde.org/neon/qt6/qt6-charts/-/commit/be6521073795542da3d6481a8e845b4733a585a0

diff --git a/debian/control b/debian/control
index 523c659..e46626f 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,15 @@ Build-Depends: cmake,
                qt6-multimedia-dev,
                xauth <!nocheck>,
                xvfb <!nocheck>
-Standards-Version: 4.6.1
+Architecture: any
+X-Neon-MergedPackage: true
+Multi-Arch: same
+Depends: misc:Depends, shlibs:Depends
+Architecture: any
+X-Neon-MergedPackage: true
+Multi-Arch: same
+Depends: misc:Depends, shlibs:Depends
+Standards-Version: 4.6.
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-charts
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-charts.git
@@ -52,6 +60,20 @@ Description: Qt 6 charts - development files
  This package contains the header development files used for building Qt 6
  applications using QtCharts.
 
+Package: qt6-charts-doc
+Architecture: any
+Section: kde
+X-Neon-MergedPackage: true
+Depends: qt6-base-doc, qt6-charts-dev (= ${binary:Version}), ${misc:Depends}
+Description: Qt 6 charts - 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.
+ .
+ The Qt Charts module provides a set of easy to use chart components.
+ .
+ This package contains the header documentation used to help build Qt 6
+ applications using QtCharts.
+
 Package: libqt6charts6
 Architecture: all
 Depends: qt6-charts
@@ -75,3 +97,15 @@ Architecture: all
 Depends: qt6-charts
 Description: Dummy transitional
  Transitional dummy package.
+
+Package: qt6-charts-doc-html
+Architecture: all
+Depends: qt6-charts-doc
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-charts-examples
+Architecture: all
+Depends: qt6-charts-dev
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/not-installed b/debian/not-installed
index 4928737..e69de29 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,4 +0,0 @@
-usr/include/*/qt6/QtCharts/6.*
-usr/include/*/qt6/QtChartsQml/6.*
-usr/lib/*/qt6/mkspecs/modules/qt_lib_charts_private.pri
-usr/lib/*/qt6/mkspecs/modules/qt_lib_chartsqml_private.pri
diff --git a/debian/qt6-charts.install b/debian/qt6-charts.install
index 06862c7..89e4104 100644
--- a/debian/qt6-charts.install
+++ b/debian/qt6-charts.install
@@ -1,6 +1,3 @@
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6Charts.so.*
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6ChartsQml.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtCharts/designer/
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtCharts/libqtchartsqml2plugin.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtCharts/plugins.qmltypes
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtCharts/qmldir
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtCharts/
diff --git a/debian/rules b/debian/rules
index e2cde0c..dba1943 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,14 +3,29 @@ include /usr/share/dpkg/architecture.mk
 
 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 $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
 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' {} \;
 
-execute_after_dh_auto_install:
+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