[neon/qt6/qt6-remoteobjects/Neon/release] debian: sync to debian
Carlos De Maine
null at kde.org
Tue Oct 24 12:19:37 BST 2023
Git commit 1737063f6bf3cabc12c481369d680f4011b80a55 by Carlos De Maine.
Committed on 24/10/2023 at 13:19.
Pushed by carlosdem into branch 'Neon/release'.
sync to debian
M +36 -1 debian/control
A +1 -0 debian/qt6-remoteobjects-doc.install
M +21 -3 debian/rules
https://invent.kde.org/neon/qt6/qt6-remoteobjects/-/commit/1737063f6bf3cabc12c481369d680f4011b80a55
diff --git a/debian/control b/debian/control
index a4446e6..49fe1db 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,10 @@ Build-Depends: cmake,
qt6-declarative-dev (>= 6.4.2+dfsg~),
xauth <!nocheck>,
xvfb <!nocheck>
-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-remoteobjects
Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-remoteobjects.git
@@ -53,6 +56,20 @@ Description: Qt 6 Remote Objects - development files
.
This package contains the development files for Qt Remote Objects.
+Package: qt6-remoteobjects-doc
+Architecture: all
+Section: kde
+X-Neon-MergedPackage: true
+Depends: qt6-base-doc, qt6-remoteobjects-dev (= ${binary:Version}), ${misc:Depends}
+Description: Qt 6 Remote Objects - 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 Remote Objects extends Qt's existing functionalities to enable
+ information exchange between processes or computers.
+ .
+ This package contains the documentation files for Qt Remote Objects.
+
Package: libqt6remoteobjects6
Architecture: all
Depends: qt6-remoteobjects
@@ -76,3 +93,21 @@ Architecture: all
Depends: qt6-remoteobjects
Description: Dummy transitional
Transitional dummy package.
+
+Package: qt6-remoteobjects-doc-dev
+Architecture: all
+Depends: qt6-remoteobjects-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-remoteobjects-doc-html
+Architecture: all
+Depends: qt6-remoteobjects-doc
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-remoteobjects-examples
+Architecture: all
+Depends: qt6-remoteobjects-dev
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/qt6-remoteobjects-doc.install b/debian/qt6-remoteobjects-doc.install
new file mode 100644
index 0000000..8536ff4
--- /dev/null
+++ b/debian/qt6-remoteobjects-doc.install
@@ -0,0 +1 @@
+usr/share/qt6/doc/
diff --git a/debian/rules b/debian/rules
index 62ab791..055263c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,15 @@
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 \
+ -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/$(DEB_BUILD_MULTIARCH)/cmake \
+ -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON
+endif
%:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
@@ -10,8 +18,18 @@ 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' {} \;
-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
More information about the Neon-commits
mailing list