[neon/qt6/qt6-serialport/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:32:44 GMT 2022
Git commit 6d42edf45041befa65fd786c15f60ee57c8e56be 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 +87 -5 debian/changelog
M +16 -7 debian/control
M +3 -1 debian/qt6-serialport-dev.install
M +3 -3 debian/rules
https://invent.kde.org/neon/qt6/qt6-serialport/commit/6d42edf45041befa65fd786c15f60ee57c8e56be
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 20ead2a..01cb37e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,95 @@
-qt6-serialport (6.2.3-0neon) UNRELEASED; urgency=medium
+qt6-serialport (6.4.1-2) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * Rename libqt6serialport6-dev to qt6-serialport-dev.
+ * Enable link time optimization.
+
+ -- Patrick Franz <deltaone at debian.org> Wed, 30 Nov 2022 20:08:58 +0100
+
+qt6-serialport (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:29:55 +0100
+
+qt6-serialport (6.4.0-1) experimental; urgency=medium
+
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Remove libvulkan-dev as a build dependency, it was really needed as a
+ qt6-base-dev dependency due to a CMake file.
+ * Add debian/[.gitignore .gitattributes].
+ * 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 symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Wed, 05 Oct 2022 20:45:24 +0200
+
+qt6-serialport (6.3.1-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Mon, 15 Aug 2022 19:23:51 +0200
+
+qt6-serialport (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:23:50 +0200
+
+qt6-serialport (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.
+
+ -- Patrick Franz <deltaone at debian.org> Sun, 29 May 2022 20:52:22 +0200
+
+qt6-serialport (6.2.4-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Fri, 22 Apr 2022 20:07:22 +0200
+
+qt6-serialport (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:38:04 +0200
+
+qt6-serialport (6.2.2-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Tue, 15 Feb 2022 22:00:12 +0100
+
+qt6-serialport (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 08:43:21 +0100
qt6-serialport (6.2.1-2) experimental; urgency=medium
@@ -16,7 +98,7 @@ qt6-serialport (6.2.1-2) experimental; urgency=medium
-- Patrick Franz <deltaone at debian.org> Sun, 21 Nov 2021 02:33:53 +0100
-qt6-serialport (6.2.2-0neon) experimental; urgency=medium
+qt6-serialport (6.2.1-1) experimental; urgency=medium
* Initial release (Closes: #998819)
diff --git a/debian/control b/debian/control
index c387151..c7706b1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,14 @@ 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,
- libvulkan-dev [linux-any],
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-serialport
Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-serialport.git
@@ -20,20 +19,30 @@ Rules-Requires-Root: no
Package: qt6-serialport
Architecture: any
Section: kde
-Provides: libqt6serialport6, qt6-serialport
+X-Neon-MergedPackage: true
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 6 serial port
+Description: Qt 6 serial port support library
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the library for Qt 6 Serial ports.
Package: qt6-serialport-dev
Architecture: any
Section: kde
-Provides: libqt6serialport6-dev, qt6-serialport-dev
+X-Neon-MergedPackage: true
Depends: qt6-base-dev, qt6-serialport (= ${binary:Version}), ${misc:Depends}
+Breaks: libqt6serialport6-dev (<< 6.4.1-2~)
+Replaces: libqt6serialport6-dev (<< 6.4.1-2~)
Description: Qt 6 serial port 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.
.
This package contains the development headers for the serial port library.
+
+Package: libqt6serialport6
+Architecture: all
+Depends: qt6-serialport
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/qt6-serialport-dev.install b/debian/qt6-serialport-dev.install
index 8788b47..bee7b96 100644
--- a/debian/qt6-serialport-dev.install
+++ b/debian/qt6-serialport-dev.install
@@ -7,11 +7,13 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialPort/qserialport.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialPort/qserialportglobal.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialPort/qserialportinfo.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialPort/qtserialport-config.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialPort/qtserialportexports.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialPort/qtserialportversion.h
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtSerialPortTestsConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialPort/Qt6SerialPortAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialPort/Qt6SerialPortConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialPort/Qt6SerialPortConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialPort/Qt6SerialPortConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialPort/Qt6SerialPortDependencies.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialPort/Qt6SerialPortTargets-*.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialPort/Qt6SerialPortTargets.cmake
@@ -19,6 +21,6 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialPort/Qt6SerialPortVersionlessTarget
usr/lib/${DEB_HOST_MULTIARCH}/libQt6SerialPort.prl
usr/lib/${DEB_HOST_MULTIARCH}/libQt6SerialPort.so
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6serialport_*_metatypes.json
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6SerialPort.pc
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_serialport.pri
-usr/lib/*/cmake/Qt6SerialPort/Qt6SerialPortConfigVersionImpl.cmake
usr/share/qt6/modules/SerialPort.json
diff --git a/debian/rules b/debian/rules
index d099136..ef41f14 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,15 +2,15 @@
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