[neon/qt6/qt6-positioning/Neon/release] debian: lints and internal build versoins

Carlos De Maine null at kde.org
Sat Dec 9 05:41:32 GMT 2023


Git commit 85d8bf93704c7a953490abccac19b3805919a151 by Carlos De Maine.
Committed on 09/12/2023 at 06:41.
Pushed by carlosdem into branch 'Neon/release'.

lints and internal build versoins

M  +33   -18   debian/control
M  +4    -4    debian/copyright
M  +1    -0    debian/qt6-positioning-dev.install
A  +1    -0    debian/qt6-positioning.lintian-overrides

https://invent.kde.org/neon/qt6/qt6-positioning/-/commit/85d8bf93704c7a953490abccac19b3805919a151

diff --git a/debian/control b/debian/control
index 0e788ea..b66b7bb 100644
--- a/debian/control
+++ b/debian/control
@@ -16,16 +16,16 @@ 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-serialport-dev (>= 6.4.2~),
+               qt6-base-dev (>= 6.6.1~),
+               qt6-declarative-dev (>= 6.6.1~),
+               qt6-serialport-dev (>= 6.6.1~),
                rapidjson-dev (>= 1.1.0),
                xauth <!nocheck>,
                xvfb <!nocheck>,
                zlib1g-dev
-Build-Depends-Indep: qt6-base-dev (>= 6.4~) <!nodoc>,
-                     qt6-documentation-tools (>= 6.4~) <!nodoc>,
-                     qt6-base-doc (>= 6.4~) <!nodoc>,
+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-positioning
@@ -37,10 +37,14 @@ Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libqt6positioning6 (= ${binary:Version}),
-         libqt6positioning6-plugins (= ${binary:Version}),
-         ${misc:Depends},
+Depends: ${misc:Depends},
          ${shlibs:Depends}
+Provides: libqt6positioning6,
+          libqt6positioningquick6,
+          qml6-module-positioning,
+Replaces: libqt6positioning6,
+          libqt6positioningquick6,
+          qml6-module-positioning,
 Description: Qt 6 Positioning library
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -54,7 +58,10 @@ X-Neon-MergedPackage: true
 Depends: qt6-base-dev,
          qt6-declarative-dev,
          qt6-positioning (= ${binary:Version}),
-         ${misc:Depends}
+         ${misc:Depends},
+         ${shlibs:Depends},
+Provides: qt6-positioning-doc-dev, qt6-positioning-examples,
+Replaces: qt6-positioning-doc-dev, qt6-positioning-examples,
 Description: Qt 6 Positioning - 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,6 +76,8 @@ X-Neon-MergedPackage: true
 Depends: qt6-base-doc,
          qt6-positioning-dev (= ${binary:Version}),
          ${misc:Depends}
+Provides: qt6-positioning-doc-html,
+Replaces: qt6-positioning-doc-html,
 Description: Qt 6 Positioning - 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.
@@ -78,36 +87,42 @@ Description: Qt 6 Positioning - documentation files
 
 Package: libqt6positioning6
 Architecture: all
-Depends: qt6-positioning
+Depends: qt6-positioning, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: libqt6positioningquick6
+Package: libqt6positioning6-plugins
 Architecture: all
-Depends: qt6-positioning
+Depends: qt6-positioning, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: libqt6positioning6-plugins
+Package: libqt6positioningquick6
 Architecture: all
-Depends: qt6-positioning
+Depends: qt6-positioning, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qml6-module-qtpositioning
 Architecture: all
-Depends: qt6-positioning
+Depends: qt6-positioning, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-positioning-doc-dev
+Architecture: all
+Depends: qt6-positioning-dev, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-positioning-doc-html
 Architecture: all
-Depends: qt6-positioning-doc
+Depends: qt6-positioning-doc, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: qt6-positioning-examples
 Architecture: all
-Depends: qt6-positioning-dev
+Depends: qt6-positioning-dev, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
diff --git a/debian/copyright b/debian/copyright
index ee73a6e..e7a670b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,6 +8,10 @@ Copyright: 2015-2021 The Qt Company Ltd.
            2013-2016 Aaron McCarthy <mccarthy.aaron at gmail.com>
 License: LGPL-3 or GPL-2
 
+Files: *.qdoc
+Copyright: 2017-2019 The Qt Company Ltd.
+License: GFDL-NIV-1.3
+
 Files: examples/*
        src/positioning/doc/snippets/*
 Copyright: 2017 The Qt Company Ltd.
@@ -19,10 +23,6 @@ Files: conanfile.py
 Copyright: 2016-2021 The Qt Company Ltd.
 License: GPL-3 with Qt-1.0 exception
 
-Files: *.qdoc
-Copyright: 2017-2019 The Qt Company Ltd.
-License: GFDL-NIV-1.3
-
 Files: examples/positioning/weatherinfo/icons/weather-fog.png
        examples/positioning/weatherinfo/icons/weather-haze.png
        examples/positioning/weatherinfo/icons/weather-icy.png
diff --git a/debian/qt6-positioning-dev.install b/debian/qt6-positioning-dev.install
index 0d4be78..1afd184 100644
--- a/debian/qt6-positioning-dev.install
+++ b/debian/qt6-positioning-dev.install
@@ -11,6 +11,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/libQt6Positioning.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6Positioning.so
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6PositioningQuick.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6PositioningQuick.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/examples/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/
 usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/
diff --git a/debian/qt6-positioning.lintian-overrides b/debian/qt6-positioning.lintian-overrides
new file mode 100644
index 0000000..adb8665
--- /dev/null
+++ b/debian/qt6-positioning.lintian-overrides
@@ -0,0 +1 @@
+qt6-positioning: package-name-doesnt-match-sonames libQt6Positioning6 libQt6PositioningQuick6


More information about the Neon-commits mailing list