[neon/qt6/qt6-grpc/Neon/release] debian: sync to expected debian style

Carlos De Maine null at kde.org
Tue Oct 24 23:00:53 BST 2023


Git commit 8a8d8c781f0d624803e64a2d5b3274bb21cd1444 by Carlos De Maine.
Committed on 25/10/2023 at 00:00.
Pushed by carlosdem into branch 'Neon/release'.

sync to expected debian style

M  +55   -1    debian/control
A  +1    -0    debian/qt6-grpc-doc.install
M  +28   -1    debian/rules

https://invent.kde.org/neon/qt6/qt6-grpc/-/commit/8a8d8c781f0d624803e64a2d5b3274bb21cd1444

diff --git a/debian/control b/debian/control
index 16b3171..a6fe20a 100644
--- a/debian/control
+++ b/debian/control
@@ -36,10 +36,64 @@ Package: qt6-grpc-dev
 Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
-Depends: qt6-grpc (= ${binary:Version}), ${misc:Depends}
+Depends: qt6-base-dev, qt6-grpc (= ${binary:Version}), ${misc:Depends}
 Description: Qt 6 shader tools module - development 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 files needed to build Qt 6 applications
  using the QtGrpc and QtProtobuf modules.
+
+Package: qt6-grpc-doc
+Architecture: all
+Section: kde
+X-Neon-MergedPackage: true
+Depends: qt6-base-doc, qt6-grpc-dev (= ${binary:Version}), ${misc:Depends}
+Description: Qt 6 shader tools module - 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 documentation files to help build Qt 6 applications
+ using the QtGrpc and QtProtobuf modules.
+
+Package: libqt6grpc6
+Architecture: all
+Depends: qt6-grpc
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6grpcquick6
+Architecture: all
+Depends: qt6-grpc
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6grpc6-plugins
+Architecture: all
+Depends: qt6-grpc
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qtgrpc
+Architecture: all
+Depends: qt6-grpc
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-grpc-doc-dev
+Architecture: all
+Depends: qt6-grpc-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-grpc-doc-html
+Architecture: all
+Depends: qt6-grpc-doc
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-grpc-examples
+Architecture: all
+Depends: qt6-grpc-dev
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/qt6-grpc-doc.install b/debian/qt6-grpc-doc.install
new file mode 100644
index 0000000..8536ff4
--- /dev/null
+++ b/debian/qt6-grpc-doc.install
@@ -0,0 +1 @@
+usr/share/qt6/doc/
diff --git a/debian/rules b/debian/rules
index 9849451..dba1943 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,31 @@
 #!/usr/bin/make -f
+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 $@ --buildsystem=cmake+ninja
+	dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--log-level=STATUS \
+		-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-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