[neon/qt6/qt6-webview/Neon/release] debian: lints and internal dep versions

Carlos De Maine null at kde.org
Sun Dec 10 12:00:12 GMT 2023


Git commit d77d53f2663f9eaed901717834f25cf311e986ba by Carlos De Maine.
Committed on 10/12/2023 at 12:59.
Pushed by carlosdem into branch 'Neon/release'.

lints and internal dep versions

M  +1    -1    debian/changelog
M  +34   -20   debian/control
M  +0    -4    debian/copyright
M  +1    -0    debian/qt6-webview-dev.install
A  +1    -0    debian/qt6-webview.lintian-overrides

https://invent.kde.org/neon/qt6/qt6-webview/-/commit/d77d53f2663f9eaed901717834f25cf311e986ba

diff --git a/debian/changelog b/debian/changelog
index 759214d..641a670 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -94,4 +94,4 @@ qt6-webview (6.2.2-1) experimental; urgency=medium
 
   * Initial release (Closes: #1000168)
 
- -- Patrick Franz <deltaone at debian.org>  Tue, 18 Jan 2022 20:23:22 +0100
\ No newline at end of file
+ -- Patrick Franz <deltaone at debian.org>  Tue, 18 Jan 2022 20:23:22 +0100
diff --git a/debian/control b/debian/control
index 755712c..d4fd5f2 100644
--- a/debian/control
+++ b/debian/control
@@ -16,16 +16,12 @@ Build-Depends: cmake,
                ninja-build,
                pkg-config,
                pkg-kde-tools,
-               qml6-module-qtwebengine (>= 6.4.2+dfsg~),
-               qml6-module-qtwebengine-controlsdelegates (>= 6.4.2+dfsg~),
-               qt6-base-dev (>= 6.4.2+dfsg~),
-               qt6-declarative-dev (>= 6.4.2+dfsg~),
-               qt6-webengine-dev (>= 6.4.2+dfsg~),
-               qt6-webengine-dev-tools (>= 6.4.2+dfsg~),
-               qt6-webengine-private-dev (>= 6.4.2+dfsg~),
-Build-Depends-Indep: qt6-base-dev (>= 6.4~) <!nodoc>,
-                     qt6-documentation-tools (>= 6.4~) <!nodoc>,
-                     qt6-base-doc (>= 6.4~) <!nodoc>,
+               qt6-base-dev (>= 6.6.1~),
+               qt6-declarative-dev (>= 6.6.1~),
+               qt6-webengine-dev (>= 6.6.1~),
+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
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-webview
@@ -36,11 +32,19 @@ Package: qt6-webview
 Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
+Pre-Depends: ${misc:Pre-Depends}
 Depends: fontconfig,
-         qml6-module-qtwebengine,
+         qt6-webengine,
          ${misc:Depends},
          ${shlibs:Depends}
-Pre-Depends: ${misc:Pre-Depends}
+Provides: libqt6webview6,
+          libqt6webviewquick6,
+          qt6-webview-plugins,
+          qml6-module-qtwebview,
+Replaces: libqt6webview6,
+          libqt6webviewquick6,
+          qt6-webview-plugins,
+          qml6-module-qtwebview,
 Description: Qt 6 WebView library
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -55,10 +59,14 @@ Package: qt6-webview-dev
 Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
+Pre-Depends: ${misc:Pre-Depends}
 Depends: qt6-base-dev,
          qt6-declarative-dev,
          qt6-webview (= ${binary:Version}),
-         ${misc:Depends}
+         ${misc:Depends},
+         ${shlibs:Depends}
+Provides: qt6-webview-examples,
+Replaces: qt6-webview-examples,
 Description: Qt 6 WebView - 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.
@@ -74,7 +82,13 @@ Package: qt6-webview-doc
 Architecture: all
 Section: kde
 X-Neon-MergedPackage: true
-Depends: qt6-base-doc, qt6-webview-dev (= ${binary:Version}), ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Depends: qt6-base-doc,
+         qt6-webview-dev (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Provides: qt6-webview-doc-html,
+Replaces: qt6-webview-doc-html,
 Description: Qt 6 WebView documentation
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -83,36 +97,36 @@ Description: Qt 6 WebView documentation
 
 Package: libqt6webview6
 Architecture: all
-Depends: qt6-webview
+Depends: qt6-webview, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libqt6webviewquick6
 Architecture: all
-Depends: qt6-webview
+Depends: qt6-webview, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-webview-plugins
 Architecture: all
-Depends: qt6-webview
+Depends: qt6-webview, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qml6-module-qtwebview
 Architecture: all
-Depends: qt6-webview
+Depends: qt6-webview, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-webview-doc-html
 Architecture: all
-Depends: qt6-webview-doc
+Depends: qt6-webview-doc, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-webview-examples
 Architecture: all
-Depends: qt6-webview-dev
+Depends: qt6-webview-dev, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
diff --git a/debian/copyright b/debian/copyright
index cc72ceb..0b1468c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,10 +11,6 @@ Copyright: 2022 Patrick Franz <deltaone at debian.org>,
            2022 Lu YaNing <dluyaning at gmail.com>
 License: LGPL-3 or GPL-2+
 
-Files: conanfile.py
-Copyright: 2021 The Qt Company Ltd.
-License: GPL-3 with Qt-1.0 exception
-
 Files: examples/webview/minibrowser/main.cpp
        examples/webview/minibrowser/main.qml
 Copyright: 2017 The Qt Company Ltd
diff --git a/debian/qt6-webview-dev.install b/debian/qt6-webview-dev.install
index e28e4a2..57070c0 100644
--- a/debian/qt6-webview-dev.install
+++ b/debian/qt6-webview-dev.install
@@ -9,6 +9,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/libQt6WebView.so
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6WebViewQuick.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6WebViewQuick.so
 usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/examples/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/
diff --git a/debian/qt6-webview.lintian-overrides b/debian/qt6-webview.lintian-overrides
new file mode 100644
index 0000000..845caaf
--- /dev/null
+++ b/debian/qt6-webview.lintian-overrides
@@ -0,0 +1 @@
+qt6-webview: package-name-doesnt-match-sonames libQt6WebView6 libQt6WebViewQuick6



More information about the Neon-commits mailing list