[neon/qt6/qt6-connectivity/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:17 GMT 2022
Git commit c84f0c41f072ebc7c1493a887bb2cff5b80b54be 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 -5 debian/changelog
M +24 -6 debian/control
M +8 -7 debian/qt6-connectivity-dev.install
M +2 -1 debian/rules
https://invent.kde.org/neon/qt6/qt6-connectivity/commit/c84f0c41f072ebc7c1493a887bb2cff5b80b54be
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 c775993..b404f7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,93 @@
-qt6-connectivity (6.2.3-0neon) UNRELEASED; urgency=medium
+qt6-connectivity (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> Thu, 17 Nov 2022 19:37:17 +0100
+
+qt6-connectivity (6.4.0-2) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Tue, 18 Oct 2022 23:42:49 +0200
+
+qt6-connectivity (6.4.0-1) experimental; urgency=medium
+
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Bump minimum CMake version in order to get pkg-config's .pc files.
+
+ [ Patrick Franz ]
+ * Increase CMake verbosity level.
+ * New upstream release (6.4.0).
+ * Bump Qt B-Ds to 6.4.0.
+ * Update list of installed files.
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Sat, 15 Oct 2022 18:42:12 +0200
+
+qt6-connectivity (6.3.1-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Mon, 15 Aug 2022 19:22:29 +0200
+
+qt6-connectivity (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> Sun, 17 Jul 2022 11:42:35 +0200
+
+qt6-connectivity (6.3.0-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.3.0).
+ * Bump Qt B-Ds to 6.3.0.
+ * Update list of installed files.
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Wed, 15 Jun 2022 00:24:21 +0200
+
+qt6-connectivity (6.2.4-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Fri, 22 Apr 2022 20:06:29 +0200
+
+qt6-connectivity (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> Wed, 30 Mar 2022 22:00:04 +0200
+
+qt6-connectivity (6.2.2-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Tue, 15 Feb 2022 22:35:59 +0100
+
+qt6-connectivity (6.2.2-1) experimental; urgency=medium
[ Lu YaNing ]
* Update descriptions.
* Update symbols.
- [ Jonathan Riddell ]
- * new release
- * 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> Fri, 03 Dec 2021 16:55:23 +0100
qt6-connectivity (6.2.1-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index c57ab08..9d67798 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),
libbluetooth-dev [linux-any],
libgl-dev,
@@ -12,9 +12,9 @@ Build-Depends: cmake (>= 3.18~),
ninja-build,
pkg-config,
pkg-kde-tools,
- qt6-base-dev (>= 6.2.1+dfsg~),
- qt6-declarative-dev (>= 6.2.1+dfsg~)
-Standards-Version: 4.6.0
+ qt6-base-dev (>= 6.4.1+dfsg~),
+ qt6-declarative-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-connectivity
Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-connectivity.git
@@ -23,7 +23,7 @@ Rules-Requires-Root: no
Package: qt6-connectivity
Architecture: any
Section: kde
-Provides: libqt6bluetooth6, libqt6bluetooth6-bin, libqt6nfc6
+X-Neon-MergedPackage: true
Pre-Depends: ${misc:Pre-Depends}
Depends: libqt6bluetooth6-bin, ${misc:Depends}, ${shlibs:Depends}
Recommends: neard
@@ -36,7 +36,7 @@ Description: Qt 6 Connectivity Bluetooth library
Package: qt6-connectivity-dev
Architecture: any
Section: kde
-Provides: qt6-connectivity-dev
+X-Neon-MergedPackage: true
Depends: qt6-base-dev, qt6-connectivity (= ${binary:Version}), ${misc:Depends}
Description: Qt 6 Connectivity - development files
Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -44,3 +44,21 @@ Description: Qt 6 Connectivity - development files
.
This package contains the header development files used for building Qt 6
applications using Qt 6 Connectivity libraries.
+
+Package: libqt6bluetooth6
+Architecture: all
+Depends: qt6-connectivity
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6bluetooth6-bin
+Architecture: all
+Depends: qt6-connectivity
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6nfc6
+Architecture: all
+Depends: qt6-connectivity
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/qt6-connectivity-dev.install b/debian/qt6-connectivity-dev.install
index f9866d7..e295a7b 100644
--- a/debian/qt6-connectivity-dev.install
+++ b/debian/qt6-connectivity-dev.install
@@ -44,6 +44,7 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtBluetooth/qlowenergydescriptordata.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtBluetooth/qlowenergyservice.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtBluetooth/qlowenergyservicedata.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtBluetooth/qtbluetooth-config.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtBluetooth/qtbluetoothexports.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtBluetooth/qtbluetoothglobal.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtBluetooth/qtbluetoothversion.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNfc/QNdefFilter
@@ -66,27 +67,25 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNfc/qndefnfcurirecord.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNfc/qndefrecord.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNfc/qnearfieldmanager.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNfc/qnearfieldtarget.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNfc/qtnfc-config.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNfc/qtnfcexports.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNfc/qtnfcglobal.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtNfc/qtnfcversion.h
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindBlueZ.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindPCSCLite.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Bluetooth/Qt6BluetoothAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Bluetooth/Qt6BluetoothConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Bluetooth/Qt6BluetoothConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Bluetooth/Qt6BluetoothConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Bluetooth/Qt6BluetoothDependencies.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Bluetooth/Qt6BluetoothTargets-*.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Bluetooth/Qt6BluetoothTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Bluetooth/Qt6BluetoothVersionlessTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BluetoothTools/Qt6BluetoothToolsAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BluetoothTools/Qt6BluetoothToolsConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BluetoothTools/Qt6BluetoothToolsConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BluetoothTools/Qt6BluetoothToolsDependencies.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BluetoothTools/Qt6BluetoothToolsTargets-*.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BluetoothTools/Qt6BluetoothToolsTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BluetoothTools/Qt6BluetoothToolsVersionlessTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtConnectivityTestsConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Nfc/Qt6NfcAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Nfc/Qt6NfcConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Nfc/Qt6NfcConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Nfc/Qt6NfcConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Nfc/Qt6NfcDependencies.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Nfc/Qt6NfcTargets-*.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Nfc/Qt6NfcTargets.cmake
@@ -97,6 +96,8 @@ usr/lib/${DEB_HOST_MULTIARCH}/libQt6Nfc.prl
usr/lib/${DEB_HOST_MULTIARCH}/libQt6Nfc.so
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6bluetooth_*_metatypes.json
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6nfc_*_metatypes.json
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6Bluetooth.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6Nfc.pc
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_bluetooth.pri
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_nfc.pri
usr/share/qt6/modules/Bluetooth.json
diff --git a/debian/rules b/debian/rules
index 884c737..62ab791 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
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