[neon/qt6/qt6-connectivity/Neon/release] debian: lints and internal version deps
Carlos De Maine
null at kde.org
Sun Dec 10 07:51:29 GMT 2023
Git commit 607b885a86dbffd7d026bdb91a0f3f42ea07b46b by Carlos De Maine.
Committed on 10/12/2023 at 08:51.
Pushed by carlosdem into branch 'Neon/release'.
lints and internal version deps
M +29 -13 debian/control
M +1 -0 debian/qt6-connectivity-dev.install
A +1 -0 debian/qt6-connectivity.lintian-overrides
M +6 -10 debian/source/lintian-overrides
https://invent.kde.org/neon/qt6/qt6-connectivity/-/commit/607b885a86dbffd7d026bdb91a0f3f42ea07b46b
diff --git a/debian/control b/debian/control
index 938cdc5..1a624de 100644
--- a/debian/control
+++ b/debian/control
@@ -17,11 +17,11 @@ Build-Depends: cmake,
ninja-build,
pkg-config,
pkg-kde-tools,
- qt6-base-dev (>= 6.4.2+dfsg~),
- qt6-declarative-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~)
+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-connectivity
@@ -33,8 +33,14 @@ Architecture: any
Section: kde
X-Neon-MergedPackage: true
Pre-Depends: ${misc:Pre-Depends}
-Depends: libqt6bluetooth6-bin, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: neard
+Provides: libqt6bluetooth6,
+ libqt6bluetooth6-bin,
+ libqt6nfc6,
+Replaces: libqt6bluetooth6,
+ libqt6bluetooth6-bin,
+ libqt6nfc6,
Description: Qt 6 Connectivity Bluetooth 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,7 +51,12 @@ Package: qt6-connectivity-dev
Architecture: any
Section: kde
X-Neon-MergedPackage: true
-Depends: qt6-base-dev, qt6-connectivity (= ${binary:Version}), ${misc:Depends}
+Depends: qt6-base-dev,
+ qt6-connectivity (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Provides: qt6-connectivity-examples,
+Replaces: qt6-connectivity-examples,
Description: Qt 6 Connectivity - 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.
@@ -57,7 +68,12 @@ Package: qt6-connectivity-doc
Architecture: all
Section: kde
X-Neon-MergedPackage: true
-Depends: qt6-base-doc, qt6-connectivity-dev (= ${binary:Version}), ${misc:Depends}
+Depends: qt6-base-doc,
+ qt6-connectivity-dev (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Provides: qt6-connectivity-doc-html,
+Replaces: qt6-connectivity-doc-html,
Description: Qt 6 Connectivity - 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.
@@ -67,30 +83,30 @@ Description: Qt 6 Connectivity - documentation files
Package: libqt6bluetooth6
Architecture: all
-Depends: qt6-connectivity
+Depends: qt6-connectivity, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: libqt6bluetooth6-bin
Architecture: all
-Depends: qt6-connectivity
+Depends: qt6-connectivity, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: libqt6nfc6
Architecture: all
-Depends: qt6-connectivity
+Depends: qt6-connectivity, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: qt6-connectivity-doc-html
Architecture: all
-Depends: qt6-connectivity-doc
+Depends: qt6-connectivity-doc, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: qt6-connectivity-examples
Architecture: all
-Depends: qt6-connectivity-dev
+Depends: qt6-connectivity-dev, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
diff --git a/debian/qt6-connectivity-dev.install b/debian/qt6-connectivity-dev.install
index 3c98b39..7d69a66 100644
--- a/debian/qt6-connectivity-dev.install
+++ b/debian/qt6-connectivity-dev.install
@@ -8,6 +8,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/libQt6Bluetooth.prl
usr/lib/${DEB_HOST_MULTIARCH}/libQt6Bluetooth.so
usr/lib/${DEB_HOST_MULTIARCH}/libQt6Nfc.prl
usr/lib/${DEB_HOST_MULTIARCH}/libQt6Nfc.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/
diff --git a/debian/qt6-connectivity.lintian-overrides b/debian/qt6-connectivity.lintian-overrides
new file mode 100644
index 0000000..59d6028
--- /dev/null
+++ b/debian/qt6-connectivity.lintian-overrides
@@ -0,0 +1 @@
+qt6-connectivity: package-name-doesnt-match-sonames libQt6Bluetooth6 libQt6Nfc6
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index fe4f5fd..ca1fe9b 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,10 +1,6 @@
-# Lintian gives a false positive for the globbing order.
-# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=970274
-qt6-connectivity source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/bluetooth/btchat/doc/src/btchat.qdoc
-qt6-connectivity source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/bluetooth/btscanner/doc/src/btscanner.qdoc
-qt6-connectivity source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/bluetooth/heartrate-game/doc/src/heartrate-game.qdoc
-qt6-connectivity source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/bluetooth/heartrate-server/doc/src/heartrate-server.qdoc
-qt6-connectivity source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/bluetooth/lowenergyscanner/doc/src/lowenergyscanner.qdoc
-qt6-connectivity source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/bluetooth/pingpong/doc/src/pingpong.qdoc
-qt6-connectivity source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/nfc/annotatedurl/doc/src/annotatedurl.qdoc
-qt6-connectivity source: globbing-patterns-out-of-order debian/copyright examples/* *.qdoc examples/nfc/ndefeditor/doc/src/ndefeditor.qdoc
+qt6-connectivity source: globbing-patterns-out-of-order examples/* *.qdoc examples/bluetooth/btchat/doc/src/btchat.qdoc [debian/copyright:65]
+qt6-connectivity source: globbing-patterns-out-of-order examples/* *.qdoc examples/bluetooth/heartrate-game/doc/src/heartrate-game.qdoc [debian/copyright:65]
+qt6-connectivity source: globbing-patterns-out-of-order examples/* *.qdoc examples/bluetooth/heartrate-server/doc/src/heartrate-server.qdoc [debian/copyright:65]
+qt6-connectivity source: globbing-patterns-out-of-order examples/* *.qdoc examples/bluetooth/lowenergyscanner/doc/src/lowenergyscanner.qdoc [debian/copyright:65]
+qt6-connectivity source: globbing-patterns-out-of-order examples/* *.qdoc examples/nfc/annotatedurl/doc/src/annotatedurl.qdoc [debian/copyright:65]
+qt6-connectivity source: globbing-patterns-out-of-order examples/* *.qdoc examples/nfc/ndefeditor/doc/src/ndefeditor.qdoc [debian/copyright:65]
More information about the Neon-commits
mailing list