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

[Carlos De Maine]

Git commit 3e1dd8813f76a8233e53fb02cd259a04c194dae9 by Carlos De Maine.
Committed on 29/04/2025 at 01:15.
Pushed by carlosdem into branch 'Neon/release'.

sync to salsa

M  +8    -8    debian/control
A  +3    -0    debian/qt6-declarative-dev.links
M  +1    -1    debian/qt6-declarative-doc.install
A  +1    -0    debian/qt6-declarative-doc.links
A  +2    -0    debian/qt6-declarative.links
M  +25   -25   debian/rules

https://invent.kde.org/neon/qt6/qt6-declarative/-/commit/3e1dd8813f76a8233e53fb02cd259a04c194dae9

diff --git a/debian/control b/debian/control
index a2394cf..024f0ca 100644
--- a/debian/control
+++ b/debian/control
@@ -14,14 +14,14 @@ Build-Depends: cmake,
                ninja-build,
                pkgconf,
                pkg-kde-tools,
-               qt6-base-dev (>=6.8.2~),
+               qt6-base-dev (>=6.9.0~),
 #               qt6-declarative-dev:native <cross>,
-#               qt6-languageserver-dev (>=6.8.2~),
-#               qt6-location-dev,
-#               qt6-positioning-dev,
-#               qt6-shadertools-dev (>=6.8.2~),
-#               qt6-svg-dev,
-#               qt6-tools-dev,
+               qt6-languageserver-dev (>=6.9.0~),
+               qt6-location-dev,
+               qt6-positioning-dev,
+               qt6-shadertools-dev (>=6.9.0~),
+               qt6-svg-dev,
+               qt6-tools-dev,
 Build-Depends-Indep: qt6-base-dev (>=6.8~) <!nodoc>,
                      qt6-base-doc (>=6.8~) <!nodoc>,
                      qt6-documentation-tools (>=6.8~) <!nodoc>,
@@ -37,7 +37,7 @@ Section: kde
 X-Neon-MergedPackage: true
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Provides: qt6-declarative-abi (=6.8.2)
+Provides: qt6-declarative-abi (=6.9.0)
 Breaks: libqt6labsanimation6,
         libqt6labsfolderlistmodel6,
         libqt6labsqmlmodels6,
diff --git a/debian/qt6-declarative-dev.links b/debian/qt6-declarative-dev.links
new file mode 100644
index 0000000..fa53434
--- /dev/null
+++ b/debian/qt6-declarative-dev.links
@@ -0,0 +1,3 @@
+usr/lib/qt6/bin/qmleasing usr/bin/qmleasing6
+usr/lib/qt6/bin/qmlls usr/bin/qmlls6
+usr/lib/qt6/bin/qmlpreview usr/bin/qmlpreview6
diff --git a/debian/qt6-declarative-doc.install b/debian/qt6-declarative-doc.install
index 36c01e0..8536ff4 100644
--- a/debian/qt6-declarative-doc.install
+++ b/debian/qt6-declarative-doc.install
@@ -1 +1 @@
-#usr/share/qt6/doc/
+usr/share/qt6/doc/
diff --git a/debian/qt6-declarative-doc.links b/debian/qt6-declarative-doc.links
new file mode 100644
index 0000000..f50549e
--- /dev/null
+++ b/debian/qt6-declarative-doc.links
@@ -0,0 +1 @@
+usr/share/qt6/doc usr/share/doc/qt6-declarative-doc-html/html
diff --git a/debian/qt6-declarative.links b/debian/qt6-declarative.links
new file mode 100644
index 0000000..5b3f5e2
--- /dev/null
+++ b/debian/qt6-declarative.links
@@ -0,0 +1,2 @@
+usr/lib/qt6/bin/qml usr/bin/qml6
+usr/lib/qt6/bin/qmlscene usr/bin/qmlscene6
diff --git a/debian/rules b/debian/rules
index f41de6f..bfabacc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,22 +5,6 @@ include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
-#### uncomment when bootstrapping a new qt release ####
-#DEB_BUILD_PROFILES="nodoc"
-#export DEB_BUILD_PROFILES
-
-# the next statement obviously has to have inverted logic (ifneq instad of ifeq) to work
-# for a nodoc build as nodoc is not being added to DEB_BUILD_PROFILES for some reason
-ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)),)
-	extra_build_args +=
-	extra_install_args +=
-	build_docs += false
-else
-	extra_build_args += docs
-	extra_install_args += install_docs
-	build_docs += true
-endif
-
 # QT_HOST_PATH isn't passed in cross-builds
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 	extra_cmake_args += \
@@ -39,20 +23,36 @@ override_dh_auto_configure:
 		-DQT_UNITY_BUILD=ON \
 		$(extra_cmake_args)
 
+override_dh_shlibdeps:
+	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
+
+override_dh_makeshlibs:
+	dh_makeshlibs \
+		-XlibQt6QuickControls2Impl \
+		-XlibQt6QuickControls2Basic \
+		-XlibQt6QuickControls2BasicStyleImpl \
+		-XlibQt6QuickControls2Fusion \
+		-XlibQt6QuickControls2FusionStyleImpl \
+		-XlibQt6QuickControls2Imagine \
+		-XlibQt6QuickControls2ImagineStyleImpl \
+		-XlibQt6QuickControls2Material \
+		-XlibQt6QuickControls2MaterialStyleImpl \
+		-XlibQt6QuickControls2Universal \
+		-XlibQt6QuickControls2UniversalStyleImpl
+
+#override_dh_qmldeps:
+#	LD_LIBRARY_PATH=debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/ dh_qmldeps
+
 override_dh_auto_build-indep:
-	dh_auto_build -- $(extra_build_args)
+	dh_auto_build -- docs
 
-ifeq ($(build_docs),true)
 override_dh_auto_install-indep:
-	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- $(extra_install_args)
-	# Remove build path from index files if we are a doc build.
+	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' {} \;
-else
-override_dh_auto_install-indep:
-	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- $(extra_install_args)
-endif
+               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
+