[neon/qt6/qt6-networkauth/Neon/release] debian: lints and internal dep versions
Carlos De Maine
null at kde.org
Sun Dec 10 08:15:35 GMT 2023
Git commit 5b558212791c172e1daf1ac215de4bd080791b4b by Carlos De Maine.
Committed on 10/12/2023 at 09:15.
Pushed by carlosdem into branch 'Neon/release'.
lints and internal dep versions
M +28 -13 debian/control
M +8 -34 debian/qt6-networkauth-dev.install
A +1 -0 debian/qt6-networkauth.lintian-overrides
M +1 -2 debian/source/lintian-overrides
https://invent.kde.org/neon/qt6/qt6-networkauth/-/commit/5b558212791c172e1daf1ac215de4bd080791b4b
diff --git a/debian/control b/debian/control
index bddcf92..66ea50a 100644
--- a/debian/control
+++ b/debian/control
@@ -15,10 +15,10 @@ Build-Depends: cmake,
ninja-build,
pkg-config,
pkg-kde-tools,
- qt6-base-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~)
+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-networkauth
@@ -31,6 +31,8 @@ Section: kde
X-Neon-MergedPackage: true
Depends: ${misc:Depends}, ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
+Provides: libqt6networkauth6,
+Replaces: libqt6networkauth6,
Description: Qt 6 QtNetworkAuth 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 +47,18 @@ Package: qt6-networkauth-dev
Architecture: any
Section: kde
X-Neon-MergedPackage: true
-Depends: qt6-base-dev, qt6-networkauth (= ${binary:Version}), ${misc:Depends}
-Breaks: libqt6networkauth6-dev (<< 6.4.2-1~)
-Replaces: libqt6networkauth6-dev (<< 6.4.2-1~)
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: qt6-base-dev,
+ qt6-networkauth (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Breaks: libqt6networkauth6-dev,
+Provides: libqt6networkauth6-dev,
+ qt6-networkauth-doc-dev,
+ qt6-networkauth-examples,
+Replaces: libqt6networkauth6-dev,
+ qt6-networkauth-doc-dev,
+ qt6-networkauth-examples,
Description: Qt 6 QtNetworkAuth - 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.
@@ -63,7 +74,11 @@ Package: qt6-networkauth-doc
Architecture: all
Section: kde
X-Neon-MergedPackage: true
-Depends: qt6-base-doc, qt6-networkauth-dev (= ${binary:Version}), ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: qt6-base-doc,
+ qt6-networkauth-dev (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Qt 6 QtNetworkAuth - 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.
@@ -77,30 +92,30 @@ Description: Qt 6 QtNetworkAuth - documentation files
Package: libqt6networkauth6
Architecture: all
-Depends: qt6-networkauth
+Depends: qt6-networkauth, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: libqt6networkauth6-dev
Architecture: all
-Depends: qt6-networkauth
+Depends: qt6-networkauth, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: qt6-networkauth-doc-dev
Architecture: all
-Depends: qt6-networkauth-dev
+Depends: qt6-networkauth-dev, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: qt6-networkauth-doc-html
Architecture: all
-Depends: qt6-networkauth-doc
+Depends: qt6-networkauth-doc, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: qt6-networkauth-examples
Architecture: all
-Depends: qt6-networkauth-dev
+Depends: qt6-networkauth-dev, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
diff --git a/debian/qt6-networkauth-dev.install b/debian/qt6-networkauth-dev.install
index 07f2773..4e64f2f 100644
--- a/debian/qt6-networkauth-dev.install
+++ b/debian/qt6-networkauth-dev.install
@@ -1,36 +1,10 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/QAbstractOAuth
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/QAbstractOAuth2
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/QAbstractOAuthReplyHandler
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/QOAuth1
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/QOAuth1Signature
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/QOAuth2AuthorizationCodeFlow
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/QOAuthHttpServerReplyHandler
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/QOAuthOobReplyHandler
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/QtNetworkAuth
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/QtNetworkAuthDepends
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/QtNetworkAuthVersion
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/qabstractoauth.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/qabstractoauth2.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/qabstractoauthreplyhandler.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/qoauth1.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/qoauth1signature.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/qoauth2authorizationcodeflow.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/qoauthglobal.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/qoauthhttpserverreplyhandler.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/qoauthoobreplyhandler.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/qtnetworkauthversion.h
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtNetworkAuthTestsConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6NetworkAuth/Qt6NetworkAuthAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6NetworkAuth/Qt6NetworkAuthConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6NetworkAuth/Qt6NetworkAuthConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6NetworkAuth/Qt6NetworkAuthConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6NetworkAuth/Qt6NetworkAuthDependencies.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6NetworkAuth/Qt6NetworkAuthTargets-*.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6NetworkAuth/Qt6NetworkAuthTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6NetworkAuth/Qt6NetworkAuthVersionlessTargets.cmake
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNetworkAuth/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6NetworkAuth/
usr/lib/${DEB_HOST_MULTIARCH}/libQt6NetworkAuth.prl
usr/lib/${DEB_HOST_MULTIARCH}/libQt6NetworkAuth.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/qt6networkauth_*_metatypes.json
-usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6NetworkAuth.pc
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_networkauth.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/NetworkAuth.json
+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/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/
diff --git a/debian/qt6-networkauth.lintian-overrides b/debian/qt6-networkauth.lintian-overrides
new file mode 100644
index 0000000..c5d675b
--- /dev/null
+++ b/debian/qt6-networkauth.lintian-overrides
@@ -0,0 +1 @@
+qt6-networkauth: package-name-doesnt-match-sonames libQt6NetworkAuth6
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 341fb45..8f91ee6 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,4 +1,3 @@
# Lintian gives a false positive for the globbing order.
# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=970274
-qt6-networkauth source: globbing-patterns-out-of-order debian/copyright examples/oauth/* *.qdoc examples/oauth/redditclient/doc/src/qtnetworkauth-redditclient.qdoc
-qt6-networkauth source: globbing-patterns-out-of-order debian/copyright examples/oauth/* *.qdoc examples/oauth/twittertimeline/doc/src/qtnetworkauth-twittertimeline.qdoc
+qt6-networkauth source: globbing-patterns-out-of-order examples/oauth/* *.qdoc examples/oauth/redditclient/doc/src/qtnetworkauth-redditclient.qdoc [debian/copyright:27]
More information about the Neon-commits
mailing list