[neon/qt6/qt6-declarative/Neon/release] debian: sync to debian

Carlos De Maine null at kde.org
Sun Oct 22 09:34:03 BST 2023


Git commit 157e2233a258acbc153882c4cbec0adeaf067760 by Carlos De Maine.
Committed on 22/10/2023 at 09:56.
Pushed by carlosdem into branch 'Neon/release'.

sync to debian

M  +33   -7    debian/control
M  +10   -1    debian/rules

https://invent.kde.org/neon/qt6/qt6-declarative/-/commit/157e2233a258acbc153882c4cbec0adeaf067760

diff --git a/debian/control b/debian/control
index 8f577de..edd10db 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,9 @@ Build-Depends: cmake,
                qt6-declarative-dev:native <cross>,
                qt6-languageserver-private-dev (>= 6.4.2~),
                qt6-shadertools-dev (>= 6.4.2~)
-Standards-Version: 4.6.1
+Build-Depends-Indep: qt6-base-dev (>= 6.4~) <!nodoc>,
+                     qt6-documentation-tools (>= 6.4~) <!nodoc>,
+Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-declarative.git
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-declarative
@@ -60,12 +62,6 @@ Description: Qt 6 declarative development files
  This package contains the header development files for building some
  Qt 6 applications using Qt 6 declarative headers.
 
-Package: libqt6qml6
-Architecture: all
-Depends: qt6-declarative
-Description: Dummy transitional
- Transitional dummy package.
-
 Package: libqt6labsanimation6
 Architecture: all
 Depends: qt6-declarative
@@ -102,6 +98,12 @@ Depends: qt6-declarative
 Description: Dummy transitional
  Transitional dummy package.
 
+Package: libqt6qml6
+Architecture: all
+Depends: qt6-declarative
+Description: Dummy transitional
+ Transitional dummy package.
+
 Package: libqt6qmlcompiler6
 Architecture: all
 Depends: qt6-declarative
@@ -389,3 +391,27 @@ Architecture: all
 Depends: qt6-declarative-dev
 Description: Dummy transitional
   Transitional dummy package.
+
+Package: qt6-declarative-doc
+Architecture: all
+Depends: qt6-declarative
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-declarative-doc-dev
+Architecture: all
+Depends: qt6-declarative-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-declarative-doc-html
+Architecture: all
+Depends: qt6-declarative
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-declarative-examples
+Architecture: all
+Depends: qt6-declarative
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/rules b/debian/rules
index c506d15..00ad1a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,15 @@ override_dh_auto_configure:
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
 		$(extra_cmake_args)
 
-execute_after_dh_auto_install:
+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