[neon/qt6/qt6-webengine/Neon/release] debian: lints

[Carlos De Maine]

Git commit 070211e05ee5e394241313bfb6882b104d288b04 by Carlos De Maine.
Committed on 14/12/2023 at 07:50.
Pushed by carlosdem into branch 'Neon/release'.

lints

M  +1    -1    debian/changelog
M  +1    -14   debian/control
A  +1    -0    debian/meta/cmake-ignore
A  +6    -0    debian/qt6-webengine.lintian-overrides
M  +1    -1    debian/rules
M  +4    -7    debian/source/lintian-overrides

https://invent.kde.org/neon/qt6/qt6-webengine/-/commit/070211e05ee5e394241313bfb6882b104d288b04

diff --git a/debian/changelog b/debian/changelog
index b9378f6..d9281e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -302,4 +302,4 @@ qt6-webengine (6.2.2+dfsg-1) experimental; urgency=medium
 
   * Initial release (Closes: #1000166)
 
- -- Patrick Franz <deltaone at debian.org>  Thu, 18 Nov 2021 22:33:38 +0100
\ No newline at end of file
+ -- Patrick Franz <deltaone at debian.org>  Thu, 18 Nov 2021 22:33:38 +0100
diff --git a/debian/control b/debian/control
index 475e800..96ebc8c 100644
--- a/debian/control
+++ b/debian/control
@@ -137,18 +137,6 @@ Provides: convert-bdic,
           qt6-image-formats-plugin-pdf,
           qml6-module-qtwebengine,
           qml6-module-qtwebengine-controlsdelegates,
-Replaces: libqt6pdf6,
-          libqt6pdfquick6,
-          libqt6pdfwidgets6,
-          libqt6webengine6,
-          libqt6webenginecore6,
-          libqt6webenginecore6-bin,
-          libqt6webenginequick6,
-          libqt6webenginequickdelegatesqml6,
-          libqt6webenginewidgets6,
-          libqt6webengine6-data,
-          qt6-image-formats-plugin-pdf,
-          qml6-module-qtwebengine,
 Description: Qt 6 WebEngine Core library
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -191,10 +179,9 @@ Section: kde
 X-Neon-MergedPackage: true
 Pre-Depends: ${misc:Pre-Depends}
 Depends: qt6-base-doc,
-         qt6-webengine-dev (= ${binary:Version}),
+         qt6-webengine-dev,
          ${misc:Depends}
 Provides: qt6-webengine-doc-html,
-Replaces: qt6-webengine-doc-html,
 Description: Qt 6 WebEngine library - 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.
diff --git a/debian/meta/cmake-ignore b/debian/meta/cmake-ignore
new file mode 100644
index 0000000..8a174cd
--- /dev/null
+++ b/debian/meta/cmake-ignore
@@ -0,0 +1 @@
+Gn
diff --git a/debian/qt6-webengine.lintian-overrides b/debian/qt6-webengine.lintian-overrides
new file mode 100644
index 0000000..2abd6b6
--- /dev/null
+++ b/debian/qt6-webengine.lintian-overrides
@@ -0,0 +1,6 @@
+qt6-webengine: package-name-doesnt-match-sonames libQt6Pdf6 libQt6PdfQuick6 libQt6PdfWidgets6 libQt6WebEngineCore6 libQt6WebEngineQuick6 libQt6WebEngineQuickDelegatesQml6 libQt6WebEngineWidgets6
+
+qt6-webengine: embedded-library freetype usr/lib/x86_64-linux-gnu/libQt6Pdf.so.6.6.1
+qt6-webengine: embedded-library lcms2 usr/lib/x86_64-linux-gnu/libQt6Pdf.so.6.6.1
+qt6-webengine: embedded-library libjsoncpp usr/lib/x86_64-linux-gnu/libQt6WebEngineCore.so.6.6.1
+qt6-webengine: embedded-library srtp usr/lib/x86_64-linux-gnu/libQt6WebEngineCore.so.6.6.1
diff --git a/debian/rules b/debian/rules
index 391bf22..fd2f9f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,4 +106,4 @@ execute_after_dh_auto_install:
 	find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
                sed -i 's@$(CURDIR)/@@g' {} \;
 
-override_dh_dwz:
\ No newline at end of file
+override_dh_dwz:
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 928160a..cc89233 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,19 +1,16 @@
 # to make lintian/ftp-master happy :-/
 qt6-webengine source: license-problem-json-evil src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt
 
-# license was updated in https://chromium.googlesource.com/breakpad/breakpad/+/14bbefbd9600e08d6a34d7250faa8bc9dba2113e
-# see also https://bugs.chromium.org/p/google-breakpad/issues/detail?id=270
-qt6-webengine source: license-problem-convert-utf-code [src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/convert_UTF.cc]
+qt6-webengine source: license-problem-gfdl-invariants src/3rdparty/chromium/third_party/android_ndk/prebuilt/linux-x86_64/share/info/make.info invariant part is: with no invariant sections, with the front-cover texts being a gnu manual and with the back-cover texts as in (a) below
+
 # That file says: "To avoid the problematic JSON license in your own projects, it's sufficient to exclude the bin/jsonchecker/ directory,
 # as it's the only code under the JSON license". We have added that directory to Files-Excluded.
 qt6-webengine source: license-problem-json-evil [src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt]
+
 # This is a protobuf file, not a Windows executable
 qt6-webengine source: source-contains-prebuilt-windows-binary src/3rdparty/chromium/third_party/webrtc/data/audio_processing/android/output_data_fixed.pb
-# NOTICE.txt files are installed into binary packages but Lintian
-# fails to detect them
-qt6-webengine source: missing-notice-file-for-apache-license [src/3rdparty/chromium/third_party/ukey2/src/NOTICE]
+
 # File can be generated with provided sources, see debian/missing-sources/diff-match-patch/diff-match-patch-master/dart/tests/Speedtest.dart
-qt6-webengine source: source-is-missing [debian/missing-sources/diff-match-patch/diff-match-patch-master/dart/tests/Speedtest.dart.js]
 qt6-webengine source: source-is-missing debian/missing-sources/diff-match-patch/diff-match-patch-master/dart/tests/Speedtest.dart.js
 qt6-webengine source: source-is-missing debian/missing-sources/diff-match-patch/diff-match-patch-master/javascript/diff_match_patch.js
 qt6-webengine source: source-is-missing src/3rdparty/chromium/components/variations/proto/devtools/client_variations.js