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

Mon Oct 23 23:45:12 BST 2023

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

align to debian

M  +22   -8    debian/control
M  +0    -2    debian/not-installed
M  +7    -24   debian/qt6-serialport-dev.install
M  +17   -2    debian/rules

https://invent.kde.org/neon/qt6/qt6-serialport/-/commit/3497b93995f09151683f8ff4a247f5fe1b113561

diff --git a/debian/control b/debian/control
index e3ea8bd..14f31ce 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,10 @@ Build-Depends: cmake,
                pkg-config,
                pkg-kde-tools,
                qt6-base-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/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-serialport
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-serialport.git
@@ -30,18 +33,17 @@ Description: Qt 6 serial port support library
  .
  This package contains the library for Qt 6 Serial ports.
 
-Package: qt6-serialport-dev
-Architecture: any
+Package: qt6-serialport-doc
+Architecture: all
 Section: kde
 X-Neon-MergedPackage: true
-Depends: qt6-base-dev, qt6-serialport (= ${binary:Version}), ${misc:Depends}
-Breaks: libqt6serialport6-dev (<< 6.4.2-2~)
-Replaces: libqt6serialport6-dev (<< 6.4.2-2~)
-Description: Qt 6 serial port development files
+Depends: qt6-base-doc qt6-serialport-dev (= ${binary:Version}), ${misc:Depends}
+Description: Qt 6 serial port 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.
  .
- This package contains the development headers for the serial port library.
+ This package contains the documentation for the serial port library.
+
 
 Package: libqt6serialport6
 Architecture: all
@@ -54,3 +56,15 @@ Architecture: all
 Depends: qt6-serialport-dev
 Description: Dummy transitional
  Transitional dummy package.
+
+Package: qt6-serialport-doc-html
+Architecture: all
+Depends: qt6-serialport-doc
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-serialport-examples
+Architecture: all
+Depends: qt6-serialport-dev
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/not-installed b/debian/not-installed
index d8782e6..e69de29 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,2 +0,0 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialPort/6.*
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_serialport_private.pri
diff --git a/debian/qt6-serialport-dev.install b/debian/qt6-serialport-dev.install
index b19f8e7..5fd5b4d 100644
--- a/debian/qt6-serialport-dev.install
+++ b/debian/qt6-serialport-dev.install
@@ -1,26 +1,9 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialPort/QSerialPort
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialPort/QSerialPortInfo
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialPort/QtSerialPort
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialPort/QtSerialPortDepends
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialPort/QtSerialPortVersion
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialPort/qserialport.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialPort/qserialportglobal.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialPort/qserialportinfo.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialPort/qtserialport-config.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialPort/qtserialportexports.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialPort/qtserialportversion.h
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtSerialPortTestsConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialPort/Qt6SerialPortAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialPort/Qt6SerialPortConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialPort/Qt6SerialPortConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialPort/Qt6SerialPortConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialPort/Qt6SerialPortDependencies.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialPort/Qt6SerialPortTargets-*.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialPort/Qt6SerialPortTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialPort/Qt6SerialPortVersionlessTargets.cmake
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialPort/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialPort/
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6SerialPort.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6SerialPort.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/qt6serialport_*_metatypes.json
-usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6SerialPort.pc
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_serialport.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/SerialPort.json
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/
diff --git a/debian/rules b/debian/rules
index ef41f14..fe38dda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,14 +4,29 @@ include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
+# cross-builds
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+	extra_cmake_args += -DQT_HOST_PATH=/usr
+endif
+
 %:
 	dh $@ --buildsystem=cmake+ninja --with pkgkde_symbolshelper
 
 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
