[neon/qt6/qt6-base/Neon/release] debian: finally back to normal doc build

[Carlos De Maine]

Git commit 3c06692149b4d83f55bbd456e1754e2f197471f5 by Carlos De Maine.
Committed on 01/05/2025 at 03:24.
Pushed by carlosdem into branch 'Neon/release'.

finally back to normal doc build

M  +17   -18   debian/control
M  +1    -1    debian/qt6-base-doc.install

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

diff --git a/debian/control b/debian/control
index c538689..9444ba7 100644
--- a/debian/control
+++ b/debian/control
@@ -101,9 +101,8 @@ Build-Depends: cmake,
                shared-mime-info,
                unixodbc-dev,
                zlib1g-dev,
-Build-Depends-Indep: qt6-base-dev (>=6.8~) <!nodoc>,
-                     qt6-tools (>=6.8~) <!nodoc>,
-#                     qt6-base-doc (>=6.8~) <!nodoc>,
+Build-Depends-Indep: qt6-base-dev (>=6.9~) <!nodoc>,
+                     qt6-tools (>=6.9~) <!nodoc>,
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Rules-Requires-Root: no
@@ -167,22 +166,22 @@ Pre-Depends: ${misc:Pre-Depends},
 Depends: libgl-dev,
          libglx-dev,
          libopengl-dev,
-#         libqt6concurrent6 (= ${binary:Version}),
-#         libqt6core6t64 (= ${binary:Version}),
-#         libqt6dbus6 (= ${binary:Version}),
-#         libqt6gui6 (= ${binary:Version}),
-#         libqt6network6 (= ${binary:Version}),
-#         libqt6opengl6 (= ${binary:Version}),
-#         libqt6openglwidgets6 (= ${binary:Version}),
-#         libqt6printsupport6 (= ${binary:Version}),
-#         libqt6sql6 (= ${binary:Version}),
-#         libqt6test6 (= ${binary:Version}),
-#         libqt6widgets6 (= ${binary:Version}),
-#         libqt6xml6 (= ${binary:Version}),
+         libqt6concurrent6 (= ${binary:Version}),
+         libqt6core6t64 (= ${binary:Version}),
+         libqt6dbus6 (= ${binary:Version}),
+         libqt6gui6 (= ${binary:Version}),
+         libqt6network6 (= ${binary:Version}),
+         libqt6opengl6 (= ${binary:Version}),
+         libqt6openglwidgets6 (= ${binary:Version}),
+         libqt6printsupport6 (= ${binary:Version}),
+         libqt6sql6 (= ${binary:Version}),
+         libqt6test6 (= ${binary:Version}),
+         libqt6widgets6 (= ${binary:Version}),
+         libqt6xml6 (= ${binary:Version}),
          libvulkan-dev,
-#         qmake6 (= ${binary:Version}),
-#         qt6-base-dev-tools (= ${binary:Version}),
-#         qt6-qpa-plugins (= ${binary:Version}),
+         qmake6 (= ${binary:Version}),
+         qt6-base-dev-tools (= ${binary:Version}),
+         qt6-qpa-plugins (= ${binary:Version}),
          ${misc:Depends},
 Breaks: libqt6opengl6-dev (<< 6.4.2+dfsg-12~),
 Replaces: libqt6opengl6-dev (<< 6.4.2+dfsg-12~),
diff --git a/debian/qt6-base-doc.install b/debian/qt6-base-doc.install
index 164be57..8536ff4 100644
--- a/debian/qt6-base-doc.install
+++ b/debian/qt6-base-doc.install
@@ -1 +1 @@
-#usr/share/qt6/doc/q*
+usr/share/qt6/doc/