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

Carlos De Maine null at kde.org
Sun Oct 22 14:49:03 BST 2023


Git commit 65b24e1f9a457933678d1eee020bc8179e1347fd by Carlos De Maine.
Committed on 22/10/2023 at 15:48.
Pushed by carlosdem into branch 'Neon/release'.

align to debian

M  +28   -2    debian/control
M  +1    -0    debian/qt6-multimedia-dev.install
M  +10   -1    debian/rules

https://invent.kde.org/neon/qt6/qt6-multimedia/-/commit/65b24e1f9a457933678d1eee020bc8179e1347fd

diff --git a/debian/control b/debian/control
index a6501af..93c9059 100644
--- a/debian/control
+++ b/debian/control
@@ -11,13 +11,13 @@ Build-Depends: cmake,
                libavfilter-dev,
                libavformat-dev,
                libavutil-dev,
+               libeigen3-dev,
                libgl-dev,
-               libgstreamer-plugins-bad1.0-dev
+               libgstreamer-plugins-bad1.0-dev,
                libgstreamer-plugins-base1.0-dev,
                libgstreamer-plugins-good1.0-dev,
                libopenal-dev,
                libpulse-dev,
-               libqt6opengl6-dev,
                libgstreamer1.0-dev,
                libssl-dev,
                libswscale-dev,
@@ -38,6 +38,8 @@ Build-Depends: cmake,
                qt6-svg-dev,
                xauth <!nocheck>,
                xvfb <!nocheck>
+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-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-multimedia
@@ -101,3 +103,27 @@ Architecture: all
 Depends: qt6-multimedia
 Description: Dummy transitional
  Transitional dummy package.
+
+Package: qml6-module-qtquick3d-spatialaudio
+Architecture: all
+Depends: qt6-multimedia
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-multimedia-doc
+Architecture: all
+Depends: qt6-multimedia-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-multimedia-doc-html
+Architecture: all
+Depends: qt6-multimedia-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-multimedia-examples
+Architecture: all
+Depends: qt6-multimedia-dev
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/qt6-multimedia-dev.install b/debian/qt6-multimedia-dev.install
index 3d68918..59eb3e4 100644
--- a/debian/qt6-multimedia-dev.install
+++ b/debian/qt6-multimedia-dev.install
@@ -1,3 +1,4 @@
+usr/share/doc/
 usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimedia/
 usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimediaQuick/
 usr/include/${DEB_HOST_MULTIARCH}/qt6/QtMultimediaWidgets/
diff --git a/debian/rules b/debian/rules
index bfee6c7..e64107a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,15 @@ override_dh_auto_configure:
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
 		$(cmake_extra_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