[neon/qt6/qt6-networkauth/Neon/release] debian: revert to salsa experimental for qt 6.4.1 and run qt_sixy

Jonathan Esk-Riddell null at kde.org
Tue Dec 6 13:31:53 GMT 2022 

Git commit 940973b984c60e1a9c0ababcddeb90f788dd364d by Jonathan Esk-Riddell.
Committed on 06/12/2022 at 13:30.
Pushed by jriddell into branch 'Neon/release'.

revert to salsa experimental for qt 6.4.1 and run qt_sixy

A  +1    -0    debian/.gitattributes
A  +1    -0    debian/.gitignore
M  +84   -4    debian/changelog
M  +13   -5    debian/control
A  +36   -0    debian/qt6-networkauth-dev.install
A  +1    -0    debian/qt6-networkauth.install
M  +3    -2    debian/rules

https://invent.kde.org/neon/qt6/qt6-networkauth/commit/940973b984c60e1a9c0ababcddeb90f788dd364d

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..027271b
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1 @@
+files
diff --git a/debian/changelog b/debian/changelog
index c6753e7..0933fad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,93 @@
-qt6-networkauth (6.2.3-0neon) UNRELEASED; urgency=medium
+qt6-networkauth (6.4.1-2) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * Rename libqt6networkauth6-dev to qt6-networkauth-dev.
+  * Enable link time optimization.
+
+ -- Patrick Franz <deltaone at debian.org>  Sun, 27 Nov 2022 20:33:22 +0100
+
+qt6-networkauth (6.4.1-1) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * New upstream release (6.4.1).
+  * Bump Qt B-Ds to 6.4.1.
+
+ -- Patrick Franz <deltaone at debian.org>  Tue, 15 Nov 2022 23:24:13 +0100
+
+qt6-networkauth (6.4.0-1) experimental; urgency=medium
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add debian/.gitignore.
+  * Add debian/.git-attributes.
+  * Bump CMake minimum version in order to get the relevant .pc files.
+
+  [ Patrick Franz ]
+  * Increase CMake verbosity level.
+  * New upstream release (6.4.0).
+  * Bump Qt B-Ds to 6.4.0.
+  * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org>  Wed, 05 Oct 2022 20:38:11 +0200
+
+qt6-networkauth (6.3.1-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Mon, 15 Aug 2022 19:22:56 +0200
+
+qt6-networkauth (6.3.1-1) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * New upstream release (6.3.1).
+  * Bump Qt B-Ds to 6.3.1.
+  * Bump Standards-Version to 4.6.1 (no changes needed).
+  * Update list of installed files.
+
+ -- Patrick Franz <deltaone at debian.org>  Fri, 15 Jul 2022 20:55:21 +0200
+
+qt6-networkauth (6.3.0-1) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * New upstream release (6.3.0).
+  * Bump Qt B-Ds to 6.3.0.
+
+ -- Patrick Franz <deltaone at debian.org>  Sun, 29 May 2022 20:42:23 +0200
+
+qt6-networkauth (6.2.4-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Fri, 22 Apr 2022 20:06:54 +0200
+
+qt6-networkauth (6.2.4-1) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * New upstream release (6.2.4).
+  * Bump Qt B-Ds to 6.2.4.
+
+ -- Patrick Franz <deltaone at debian.org>  Tue, 29 Mar 2022 20:31:35 +0200
+
+qt6-networkauth (6.2.2-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Tue, 15 Feb 2022 22:18:51 +0100
+
+qt6-networkauth (6.2.2-1) experimental; urgency=medium
 
   [ Lu YaNing ]
   * Fix d/copyright Upstream-Name.
   * List cmake files in detail.
 
-  [ Jonathan Riddell ]
-  * New release
+  [ Patrick Franz ]
+  * New upstream release (6.2.2).
+  * Bump Qt B-Ds to 6.2.2.
+  * Update installed files.
 
- -- Jonathan Riddell <jr at jriddell.org>  Wed, 02 Feb 2022 15:13:50 +0000
+ -- Patrick Franz <deltaone at debian.org>  Thu, 02 Dec 2021 09:44:35 +0100
 
 qt6-networkauth (6.2.1-2) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index e02bef2..c556dda 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Patrick Franz <deltaone at debian.org>, Lu YaNing <dluyaning at gmail.com>
-Build-Depends: cmake (>= 3.18~),
+Build-Depends: cmake (>= 3.24~),
                debhelper-compat (= 13),
                libgl-dev,
                libssl-dev,
@@ -11,8 +11,8 @@ Build-Depends: cmake (>= 3.18~),
                ninja-build,
                pkg-config,
                pkg-kde-tools,
-               qt6-base-dev (>= 6.2.1+dfsg~)
-Standards-Version: 4.6.0
+               qt6-base-dev (>= 6.4.1+dfsg~)
+Standards-Version: 4.6.1
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-networkauth
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-networkauth.git
@@ -21,7 +21,7 @@ Rules-Requires-Root: no
 Package: qt6-networkauth
 Architecture: any
 Section: kde
-Provides: libqt6networkauth6
+X-Neon-MergedPackage: true
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Description: Qt 6 QtNetworkAuth library
@@ -37,8 +37,10 @@ Description: Qt 6 QtNetworkAuth library
 Package: qt6-networkauth-dev
 Architecture: any
 Section: kde
-Provides: libqt6networkauth6-dev
+X-Neon-MergedPackage: true
 Depends: qt6-base-dev, qt6-networkauth (= ${binary:Version}), ${misc:Depends}
+Breaks: libqt6networkauth6-dev (<< 6.4.1-1~)
+Replaces: libqt6networkauth6-dev (<< 6.4.1-1~)
 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.
@@ -49,3 +51,9 @@ Description: Qt 6 QtNetworkAuth - development files
  .
  This package contains the development files needed to build Qt 6 applications
  using the QtNetworkAuth library.
+
+Package: libqt6networkauth6
+Architecture: all
+Depends: qt6-networkauth
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/qt6-networkauth-dev.install b/debian/qt6-networkauth-dev.install
new file mode 100644
index 0000000..1425063
--- /dev/null
+++ b/debian/qt6-networkauth-dev.install
@@ -0,0 +1,36 @@
+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/lib/${DEB_HOST_MULTIARCH}/libQt6NetworkAuth.prl
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6NetworkAuth.so
+usr/lib/${DEB_HOST_MULTIARCH}/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/share/qt6/modules/NetworkAuth.json
diff --git a/debian/qt6-networkauth.install b/debian/qt6-networkauth.install
new file mode 100644
index 0000000..7193348
--- /dev/null
+++ b/debian/qt6-networkauth.install
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6NetworkAuth.so.*
diff --git a/debian/rules b/debian/rules
index 3c94151..0c2fc5f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,15 @@
 #!/usr/bin/make -f
 include /usr/share/dpkg/architecture.mk
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
 %:
 	dh $@ --buildsystem=cmake+ninja --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+		--log-level=STATUS \
+		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
 
 execute_after_dh_auto_install:
 	# Reproducible builds: remove build paths from .prl files

More information about the Neon-commits mailing list