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

[Carlos De Maine]

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

back to normal build

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

https://invent.kde.org/neon/qt6/qt6-location/-/commit/3aca84e71ba5d5c38b175f51bd1caf0ad9dbc1bb

diff --git a/debian/control b/debian/control
index fe4399d..9302bbb 100644
--- a/debian/control
+++ b/debian/control
@@ -21,9 +21,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-location
diff --git a/debian/qt6-location-dev.install b/debian/qt6-location-dev.install
index b04a137..f323130 100644
--- a/debian/qt6-location-dev.install
+++ b/debian/qt6-location-dev.install
@@ -3,7 +3,7 @@ usr/lib/*/cmake/
 usr/lib/*/libQt6Location.prl
 usr/lib/*/libQt6Location.so
 usr/lib/*/pkgconfig/
-#usr/lib/${DEB_HOST_MULTIARCH}/qt6/examples/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/examples/
 usr/lib/*/qt6/metatypes/
 usr/lib/*/qt6/mkspecs/
 usr/lib/*/qt6/modules/
diff --git a/debian/qt6-location-doc.install b/debian/qt6-location-doc.install
index 36c01e0..8536ff4 100644
--- a/debian/qt6-location-doc.install
+++ b/debian/qt6-location-doc.install
@@ -1 +1 @@
-#usr/share/qt6/doc/
+usr/share/qt6/doc/
diff --git a/debian/qt6-location.install b/debian/qt6-location.install
index 6f78cd1..c3ef157 100644
--- a/debian/qt6-location.install
+++ b/debian/qt6-location.install
@@ -1,4 +1,4 @@
 usr/lib/*/libQt6Location.so.6
 usr/lib/*/libQt6Location.so.6*
 usr/lib/*/qt6/plugins/
-#usr/lib/*/qt6/qml/QtLocation/
+usr/lib/*/qt6/qml/QtLocation/
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: