[neon/qt6/qt6-positioning/Neon/release] debian: back to normal build

[Carlos De Maine]

Git commit 264dad7245961578b3cd0df5a2ec5a97d00efdb0 by Carlos De Maine.
Committed on 30/04/2024 at 09:30.
Pushed by carlosdem into branch 'Neon/release'.

back to normal build

M  +3    -3    debian/control
M  +3    -3    debian/qt6-positioning-dev.install
M  +1    -1    debian/qt6-positioning-doc.install
M  +2    -2    debian/qt6-positioning.install
M  +11   -11   debian/rules

https://invent.kde.org/neon/qt6/qt6-positioning/-/commit/264dad7245961578b3cd0df5a2ec5a97d00efdb0

diff --git a/debian/control b/debian/control
index 61f2b49..34ee8b4 100644
--- a/debian/control
+++ b/debian/control
@@ -22,9 +22,9 @@ Build-Depends: cmake,
                xauth <!nocheck>,
                xvfb <!nocheck>,
                zlib1g-dev
-#Build-Depends-Indep: qt6-base-dev (>= 6.7~) <!nodoc>,
-#                     qt6-documentation-tools (>= 6.7~) <!nodoc>,
-#                     qt6-base-doc (>= 6.7~) <!nodoc>,
+Build-Depends-Indep: qt6-base-dev (>= 6.7~) <!nodoc>,
+                     qt6-documentation-tools (>= 6.7~) <!nodoc>,
+                     qt6-base-doc (>= 6.7~) <!nodoc>,
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-positioning
diff --git a/debian/qt6-positioning-dev.install b/debian/qt6-positioning-dev.install
index 649ad4b..df9dc1c 100644
--- a/debian/qt6-positioning-dev.install
+++ b/debian/qt6-positioning-dev.install
@@ -2,9 +2,9 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6Positioning.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6Positioning.so
-#usr/lib/${DEB_HOST_MULTIARCH}/libQt6PositioningQuick.prl
-#usr/lib/${DEB_HOST_MULTIARCH}/libQt6PositioningQuick.so
-#usr/lib/${DEB_HOST_MULTIARCH}/qt6/examples/
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6PositioningQuick.prl
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6PositioningQuick.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/examples/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/
 usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/
diff --git a/debian/qt6-positioning-doc.install b/debian/qt6-positioning-doc.install
index 36c01e0..8536ff4 100644
--- a/debian/qt6-positioning-doc.install
+++ b/debian/qt6-positioning-doc.install
@@ -1 +1 @@
-#usr/share/qt6/doc/
+usr/share/qt6/doc/
diff --git a/debian/qt6-positioning.install b/debian/qt6-positioning.install
index 0bb8f12..9b388ba 100644
--- a/debian/qt6-positioning.install
+++ b/debian/qt6-positioning.install
@@ -1,4 +1,4 @@
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6Positioning.so.*
-#usr/lib/${DEB_HOST_MULTIARCH}/libQt6PositioningQuick.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6PositioningQuick.so.*
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/position/
-#usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtPositioning/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtPositioning/
diff --git a/debian/rules b/debian/rules
index c90a5f2..2023c24 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,21 +20,21 @@ override_dh_auto_configure:
 		$(extra_cmake_args)
 
 #ifneq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
-#override_dh_auto_build-indep:
-#	dh_auto_build -- docs
+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' {} \;
+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' {} \;
 
 #else
-override_dh_auto_build-indep:
-	dh_auto_build
+#override_dh_auto_build-indep:
+#	dh_auto_build
 
-override_dh_auto_install-indep:
-	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
+#override_dh_auto_install-indep:
+#	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
 #endif
 
 execute_after_dh_auto_install-arch: