[neon/qt6/qt6-base/Neon/release] debian: re-enable normal build

[Carlos De Maine]

Git commit c16f3affcf97c9b4a2b322775bbeb5163c66148d by Carlos De Maine.
Committed on 13/12/2023 at 08:17.
Pushed by carlosdem into branch 'Neon/release'.

re-enable normal build

M  +3    -5    debian/control
M  +1    -1    debian/qt6-base-doc.install
M  +9    -14   debian/rules

https://invent.kde.org/neon/qt6/qt6-base/-/commit/c16f3affcf97c9b4a2b322775bbeb5163c66148d

diff --git a/debian/control b/debian/control
index 1088528..493ce58 100644
--- a/debian/control
+++ b/debian/control
@@ -103,9 +103,9 @@ Build-Depends: cmake,
                shared-mime-info,
                unixodbc-dev,
                zlib1g-dev,
-#Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
-#                     qt6-documentation-tools (>= 6.6~) <!nodoc>,
-#                     qt6-base-doc (>= 6.6~) <!nodoc>,
+Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
+                     qt6-documentation-tools (>= 6.6~) <!nodoc>,
+                     qt6-base-doc (>= 6.6~) <!nodoc>,
 Standards-Version: 4.6.2
 Section: libs
 Homepage: https://www.qt.io/developers/
@@ -241,9 +241,7 @@ Depends: default-libmysqlclient-dev,
          ${misc:Depends},
          ${shlibs:Depends},
 Breaks: libqt6opengl6-dev (<< 6.4.2+dfsg-12~),
-        qt6-base-dev (<< 6.6.0+dfsg~),
 Replaces: libqt6opengl6-dev (<< 6.4.2+dfsg-12~),
-          qt6-base-dev (<< 6.6.0+dfsg~),
 Provides: libqt6opengl6-dev (= ${binary:Version}),
 Description: Qt 6 base development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
diff --git a/debian/qt6-base-doc.install b/debian/qt6-base-doc.install
index 36c01e0..8536ff4 100644
--- a/debian/qt6-base-doc.install
+++ b/debian/qt6-base-doc.install
@@ -1 +1 @@
-#usr/share/qt6/doc/
+usr/share/qt6/doc/
diff --git a/debian/rules b/debian/rules
index 0286ab5..86d953e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,10 @@ include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 sslpkgname := $(shell dpkg-query --show '--showformat=$${Depends}' libssl-dev | cut -d ' ' -f1)
+
+### uncomment when bootsrapping a new qt release
+#export BOOTSTRAP=ON
+
 # need gcc 12.1 for mold to be able to process --gdb-index
 export CC=gcc-12
 export CXX=g++-12
@@ -116,26 +120,17 @@ execute_after_dh_auto_install-arch:
 		< debian/qmake-cross-wrapper.in > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake6
 	chmod +x debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake6
 
-#	# Fix cmake config file's installed into /usr/lib/qt6/libexec
-#	mv -v debian/tmp/usr/lib/qt6/libexec/*.cmake debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6/
-
 	# Fix Qt6::qmake IMPORTED_LOCATION, see https://bugs.debian.org/1030980
 	sed -i 's,lib/qt6/bin/qmake,bin/$(DEB_HOST_GNU_TYPE)-qmake6,' \
 		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6CoreTools/Qt6CoreToolsTargets-relwithdebinfo.cmake
 
-override_dh_auto_build:
-	dh_auto_build
-
-#override_dh_auto_build-indep:
-#	dh_auto_build -- docs
-
-override_dh_auto_install:
-	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
+override_dh_auto_build-indep:
+	dh_auto_build -- docs
 
-#override_dh_auto_install-indep:
-#	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install_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 \
+	find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
 		sed -i 's@$(CURDIR)/@@g' {} \;
 
 ### no longer needed??