[neon/qt6/qt6-tools/Neon/release] debian: clean up and of course lint

[Carlos De Maine]

Git commit 2927db620cb490e975f954598591a66690db9363 by Carlos De Maine.
Committed on 14/12/2023 at 11:44.
Pushed by carlosdem into branch 'Neon/release'.

clean up and of course lint

M  +25   -7    debian/control
R  +0    -0    debian/not_patches_to_make_linters_smile/fix-build-with-system-litehtml.patch [from: debian/patches/fix-build-with-system-litehtml.patch - 100% similarity]
R  +0    -0    debian/not_patches_to_make_linters_smile/series [from: debian/patches/series - 100% similarity]
M  +1    -1    debian/qt6-tools-doc.install

https://invent.kde.org/neon/qt6/qt6-tools/-/commit/2927db620cb490e975f954598591a66690db9363

diff --git a/debian/control b/debian/control
index 0263333..f824688 100644
--- a/debian/control
+++ b/debian/control
@@ -26,9 +26,9 @@ Build-Depends: clang-14,
                pkg-kde-tools,
                qt6-base-dev (>= 6.6.1~),
                qt6-declarative-dev (>= 6.6.1~)
-#Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
-#                     qt6-base-doc (>= 6.6~) <!nodoc>,
-#                     qt6-documentation-tools (>= 6.6~) <!nodoc>,
+Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
+                     qt6-base-doc (>= 6.6~) <!nodoc>,
+                     qt6-documentation-tools (>= 6.6~) <!nodoc>,
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-tools
@@ -47,7 +47,17 @@ Depends: llvm-14,
          ${shlibs:Depends}
 Provides: qt6-designer-abi (= 6.6.1),
           qt6-help-abi (= 6.6.1),
-          qt6-uitools-abi (= 6.6.1)
+          qt6-uitools-abi (= 6.6.1),
+          libqt6designer6,
+          libqt6designercomponents6,
+          libqt6help6,
+          libqt6uitools6,
+          assistant-qt6,
+          designer-qt6,
+          linguist-qt6,
+          qdbus-qt6,
+          qt6-documentation-tools,
+          qt6-l10n-tools,
 Description: Qt 6 Designer library
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -60,6 +70,7 @@ Package: qt6-tools-dev
 Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
+Pre-Depends: ${misc:Pre-Depends}
 Depends: libclang-14-dev,
          llvm-14-dev,
          qt6-base-dev,
@@ -67,8 +78,10 @@ Depends: libclang-14-dev,
          qt6-tools (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: qt6-tools (<< 6.3.1-2~),
-Replaces: qt6-tools (<< 6.3.1-2~),
+Provides: qt6-tools-dev-tools,
+          qt6-tools-private-dev,
+          qt6-tools-doc-dev,
+          qt6-tools-doc-examples,
 Description: Qt 6 Tools - development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -81,9 +94,12 @@ Build-Profiles: <!nodoc>
 Architecture: all
 Section: kde
 X-Neon-MergedPackage: true
+Pre-Depends: ${misc:Pre-Depends}
 Depends: qt6-base-doc,
          qt6-tools-dev,
-         ${misc:Depends}
+         ${misc:Depends},
+         ${shlibs:Depends}
+Provides: qt6-tools-doc-html,
 Description: Qt 6 Tools - documentation files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -91,6 +107,8 @@ Description: Qt 6 Tools - documentation files
  This package contains the documentation files used to help build Qt 6
  applications.
 
+#### transitionals below ####
+
 Package: libqt6designer6
 Architecture: all
 Depends: qt6-tools, ${misc:Depends}
diff --git a/debian/patches/fix-build-with-system-litehtml.patch b/debian/not_patches_to_make_linters_smile/fix-build-with-system-litehtml.patch
similarity index 100%
rename from debian/patches/fix-build-with-system-litehtml.patch
rename to debian/not_patches_to_make_linters_smile/fix-build-with-system-litehtml.patch
diff --git a/debian/patches/series b/debian/not_patches_to_make_linters_smile/series
similarity index 100%
rename from debian/patches/series
rename to debian/not_patches_to_make_linters_smile/series
diff --git a/debian/qt6-tools-doc.install b/debian/qt6-tools-doc.install
index d22b0e0..6a0b95c 100644
--- a/debian/qt6-tools-doc.install
+++ b/debian/qt6-tools-doc.install
@@ -1 +1 @@
-#usr/share/qt6/doc
+usr/share/qt6/doc