[neon/qt6/qt6-declarative/Neon/release] debian: back to full build

[Carlos De Maine]

Git commit 07de8ef226e32bebaa95f1a950041c93b99a9dab by Carlos De Maine.
Committed on 29/04/2024 at 15:31.
Pushed by carlosdem into branch 'Neon/release'.

back to full build

M  +6    -6    debian/control
M  +0    -1    debian/not-installed
M  +6    -6    debian/qt6-declarative-dev.install
M  +1    -1    debian/qt6-declarative-doc.install
M  +1    -1    debian/qt6-declarative.install
M  +12   -12   debian/rules

https://invent.kde.org/neon/qt6/qt6-declarative/-/commit/07de8ef226e32bebaa95f1a950041c93b99a9dab

diff --git a/debian/control b/debian/control
index 1da822e..652572e 100644
--- a/debian/control
+++ b/debian/control
@@ -17,13 +17,13 @@ Build-Depends: cmake,
                qt6-base-dev (>=6.7.0~),
                qt6-declarative-dev:native <cross>,
                qt6-languageserver-private-dev (>=6.7.0~),
-#               qt6-location-dev,
-#               qt6-positioning-dev,
-#               qt6-shadertools-dev (>=6.7.0~),
+               qt6-location-dev,
+               qt6-positioning-dev,
+               qt6-shadertools-dev (>=6.7.0~),
                qt6-svg-dev (>=6.7~),
-#Build-Depends-Indep: qt6-base-dev (>=6.7~) <!nodoc>,
-#                     qt6-base-doc (>=6.7~) <!nodoc>,
-#                     qt6-documentation-tools (>=6.7~) <!nodoc>,
+Build-Depends-Indep: qt6-base-dev (>=6.7~) <!nodoc>,
+                     qt6-base-doc (>=6.7~) <!nodoc>,
+                     qt6-documentation-tools (>=6.7~) <!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
diff --git a/debian/not-installed b/debian/not-installed
index f4299aa..e69de29 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/objects-None/QmlTypeRegistrarPrivate_resources_1/.rcc/qrc_jsRootMetaTypes_init.cpp.o
\ No newline at end of file
diff --git a/debian/qt6-declarative-dev.install b/debian/qt6-declarative-dev.install
index 0930686..90bf356 100644
--- a/debian/qt6-declarative-dev.install
+++ b/debian/qt6-declarative-dev.install
@@ -5,22 +5,22 @@ usr/lib/${DEB_HOST_MULTIARCH}/*.so
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/
 usr/lib/${DEB_HOST_MULTIARCH}/objects-*/
 usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
-#usr/lib/${DEB_HOST_MULTIARCH}/qt6/examples/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/examples/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/*.json
 usr/lib/qt6/bin/qmldom
-#usr/lib/qt6/bin/qmleasing
+usr/lib/qt6/bin/qmleasing
 usr/lib/qt6/bin/qmlformat
 usr/lib/qt6/bin/qmllint
 usr/lib/qt6/bin/qmlls
-#usr/lib/qt6/bin/qmlplugindump
+usr/lib/qt6/bin/qmlplugindump
 usr/lib/qt6/bin/qmlpreview
 usr/lib/qt6/bin/qmlprofiler
 usr/lib/qt6/bin/qmltc
-#usr/lib/qt6/bin/qmltestrunner
-#usr/lib/qt6/bin/qmltime
-#usr/lib/qt6/bin/svgtoqml
+usr/lib/qt6/bin/qmltestrunner
+usr/lib/qt6/bin/qmltime
+usr/lib/qt6/bin/svgtoqml
 usr/lib/qt6/libexec/qmlcachegen
 usr/lib/qt6/libexec/qmlimportscanner
 usr/lib/qt6/libexec/qmltyperegistrar
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.install b/debian/qt6-declarative.install
index 5d29d37..f0efb85 100644
--- a/debian/qt6-declarative.install
+++ b/debian/qt6-declarative.install
@@ -2,5 +2,5 @@ usr/lib/${DEB_HOST_MULTIARCH}/libQt6*.so.*
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/
 usr/lib/qt6/bin/qml
-#usr/lib/qt6/bin/qmlscene
+usr/lib/qt6/bin/qmlscene
 usr/lib/qt6/libexec/qmljsrootgen
diff --git a/debian/rules b/debian/rules
index d21071a..2760901 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,21 +25,21 @@ override_dh_auto_configure:
 		$(extra_cmake_args)
 
 ## attention to the negation
-#ifneq ($(filter neon_nodoc,$(DEB_BUILD_PROFILES)),)
-#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' {} \;
-#else
+ifneq ($(filter neon_nodoc,$(DEB_BUILD_PROFILES)),)
 override_dh_auto_build-indep:
-	dh_auto_build
+	dh_auto_build -- docs
 
 override_dh_auto_install-indep:
-	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
+	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_install-indep:
+#	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
 #endif
 
 execute_after_dh_auto_install-arch: