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

Sun Dec 10 04:52:27 GMT 2023

Git commit 0609abbfde8c93dba8101ec4925d6f57a6f64c72 by Carlos De Maine.
Committed on 10/12/2023 at 05:52.
Pushed by carlosdem into branch 'Neon/release'.

lints and internal dep versions

M  +23   -14   debian/control
M  +0    -8    debian/copyright
M  +0    -14   debian/not-installed
M  +1    -1    debian/qt6-5compat-dev.install
A  +1    -0    debian/qt6-5compat.lintian-overrides

https://invent.kde.org/neon/qt6/qt6-5compat/-/commit/0609abbfde8c93dba8101ec4925d6f57a6f64c72

diff --git a/debian/control b/debian/control
index d4d850e..17df79d 100644
--- a/debian/control
+++ b/debian/control
@@ -17,12 +17,12 @@ Build-Depends: cmake,
                ninja-build,
                pkg-config,
                pkg-kde-tools,
-               qt6-base-dev (>= 6.4.2+dfsg~),
-               qt6-declarative-dev (>= 6.4.2+dfsg~),
-               qt6-shadertools-dev (>= 6.4.2~)
-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-shadertools-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-5compat
@@ -33,8 +33,8 @@ Package: qt6-5compat
 Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
-Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 6 Qt5Compat library
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -45,9 +45,12 @@ Package: qt6-5compat-dev
 Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
+Pre-Depends: ${misc:Pre-Depends}
 Depends: qt6-5compat (= ${binary:Version}), qt6-base-dev, ${misc:Depends}
-Breaks: libqt6core5compat6-dev (<< 6.4.2-1~)
-Replaces: libqt6core5compat6-dev (<< 6.4.2-1~)
+Provides: libqt6core5compat6,
+          qml6-module-qt5compat-graphicaleffects,
+Replaces: libqt6core5compat6-dev,
+          qml6-module-qt5compat-graphicaleffects,
 Description: Qt 6 Qt5Compat - 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.
@@ -59,7 +62,13 @@ Package: qt6-5compat-doc
 Architecture: all
 Section: kde
 X-Neon-MergedPackage: true
-Depends: qt6-5compat-dev (= ${binary:Version}), qt6-base-doc, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Depends: qt6-5compat-dev (= ${binary:Version}),
+         qt6-base-doc,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Provides: qt6-5compat-doc-html,
+Replaces: qt6-5compat-doc-html,
 Description: Qt 6 Qt5Compat - 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.
@@ -69,23 +78,23 @@ Description: Qt 6 Qt5Compat - development files
 
 Package: libqt6core5compat6
 Architecture: all
-Depends: qt6-5compat
+Depends: qt6-5compat, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libqt6core5compat6-dev
 Architecture: all
-Depends: qt6-5compat-dev
+Depends: qt6-5compat-dev, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qml6-module-qt5compat-graphicaleffects
 Architecture: all
-Depends: qt6-5compat
+Depends: qt6-5compat, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-5compat-doc-html
 Architecture: all
-Depends: qt6-5compat-doc
+Depends: qt6-5compat-doc, ${misc:Depends}
 Description: Dummy transitional
diff --git a/debian/copyright b/debian/copyright
index bc35edc..3cb4fa3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,15 +21,7 @@ Files: src/core5/codecs/qtcore5-codecs.qdoc
 Copyright: 2016-2020 The Qt Company Ltd.
 License: GFDL-NIV-1.3
 
-Files: conanfile.py
-       tests/*
-       util/unicode/codecs/big5/main.cpp
-Copyright: 2016-2021 The Qt Company Ltd.
-           2016-2018 Intel Corporation.
-License: GPL-3 with Qt-1.0 exception
-
 Files: src/core5/doc/snippets/*
-       src/imports/graphicaleffects5/private/plugin.cpp
        src/imports/graphicaleffects5/private/qgfxsourceproxy.cpp
        src/imports/graphicaleffects5/private/qgfxsourceproxy_p.h
        src/imports/graphicaleffects5/*.qml
diff --git a/debian/not-installed b/debian/not-installed
index 5e46c7b..e69de29 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,14 +0,0 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtCore5Compat/6.*
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectspluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectspluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectspluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectspluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectspluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectspluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectsprivateAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectsprivateConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectsprivateConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectsprivateConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectsprivateTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectsprivateTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_core5compat_private.pri
diff --git a/debian/qt6-5compat-dev.install b/debian/qt6-5compat-dev.install
index c5ee420..274ce5d 100644
--- a/debian/qt6-5compat-dev.install
+++ b/debian/qt6-5compat-dev.install
@@ -4,5 +4,5 @@ usr/lib/${DEB_HOST_MULTIARCH}/libQt6Core5Compat.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6Core5Compat.so
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/qt6core5compat_*_metatypes.json
 usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6Core5Compat.pc
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_core5compat.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/Core5Compat.json
diff --git a/debian/qt6-5compat.lintian-overrides b/debian/qt6-5compat.lintian-overrides
new file mode 100644
index 0000000..dd80d80
--- /dev/null
+++ b/debian/qt6-5compat.lintian-overrides
@@ -0,0 +1 @@
+package-name-doesnt-match-sonames libQt6Core5Compat6
