[neon/qt6/qt6-serialbus/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:38 GMT 2022
Git commit 9de07329fcde366d46fe7bd1a961e64f48e004a3 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 +111 -4 debian/changelog
M +28 -9 debian/control
M +15 -12 debian/qt6-serialbus-dev.install
M +1 -1 debian/qt6-serialbus.install
M +3 -2 debian/rules
https://invent.kde.org/neon/qt6/qt6-serialbus/commit/9de07329fcde366d46fe7bd1a961e64f48e004a3
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 a7212dc..02bb468 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,117 @@
-qt6-serialbus (6.2.3-0neon) UNRELEASED; urgency=medium
+qt6-serialbus (6.4.1-2) experimental; urgency=medium
- * New release
+ [ Patrick Franz ]
+ * Rename libqt6serialbus6-dev to qt6-serialbus-dev.
+ * Update dependencies.
+ * Enable link time optimization.
+
+ -- Patrick Franz <deltaone at debian.org> Wed, 30 Nov 2022 20:20:27 +0100
+
+qt6-serialbus (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> Sat, 19 Nov 2022 01:08:38 +0100
+
+qt6-serialbus (6.4.0-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.4.0).
+ * Bump Qt B-Ds to 6.4.0.
+ * Increase CMake verbosity level.
+ * Update list of installed files.
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Sat, 15 Oct 2022 11:33:15 +0200
+
+qt6-serialbus (6.3.1-3) unstable; urgency=medium
+
+ * Team upload.
+ * Bump minimum CMake version in order to get pkg-config's .pc files.
+ * Merge the plugins with the library, the CAN classes are useless without
+ them.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Mon, 12 Sep 2022 17:08:16 -0300
+
+qt6-serialbus (6.3.1-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Mon, 15 Aug 2022 19:23:48 +0200
+
+qt6-serialbus (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> Sat, 16 Jul 2022 12:40:50 +0200
+
+qt6-serialbus (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> Mon, 20 Jun 2022 02:21:27 +0200
+
+qt6-serialbus (6.2.4-3) unstable; urgency=medium
+
+ * Team upload.
+ * Make libqt6serialbus6-dev depend upon libqt6serialbus6-bin and
+ libqt6serialport6-dev (Closes: #1012582, 1012589).
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Thu, 09 Jun 2022 17:34:02 -0300
+
+qt6-serialbus (6.2.4-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Fri, 22 Apr 2022 20:07:19 +0200
+
+qt6-serialbus (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 20:37:14 +0200
+
+qt6-serialbus (6.2.2-3) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Tue, 15 Feb 2022 22:21:46 +0100
+
+qt6-serialbus (6.2.2-2) experimental; urgency=medium
+
+ * Team upload.
+ * Fix build on non-Linux architectures:
+ - add the dh-exec build dependency, needed for architecture filters in
+ .install files
+ - make libqt6serialbus6-dev.install use dh-exec, and limit installation
+ of Linux-only files
+
+ -- Pino Toscano <pino at debian.org> Sun, 30 Jan 2022 12:23:20 +0100
+
+qt6-serialbus (6.2.2-1) experimental; urgency=medium
+
+ [ 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 09:50:09 +0100
-qt6-serialbus (6.2.2-0neon) experimental; urgency=medium
+qt6-serialbus (6.2.1-3) experimental; urgency=medium
[ Lu YaNing ]
* Update description.
diff --git a/debian/control b/debian/control
index 0ffa3a3..03ca4f6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,18 @@ 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),
+ dh-exec,
libgl-dev,
- qt6-serialport-dev (>= 6.2.2),
libvulkan-dev [linux-any],
linux-libc-dev [linux-any],
ninja-build,
pkg-config,
pkg-kde-tools,
- qt6-base-dev (>= 6.2.2)
-Standards-Version: 4.6.0
+ qt6-base-dev (>= 6.4.1+dfsg~),
+ qt6-serialport-dev (>= 6.4.1~)
+Standards-Version: 4.6.1
Homepage: https://www.qt.io/developers/
Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-serialbus
Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-serialbus.git
@@ -22,9 +23,10 @@ Rules-Requires-Root: no
Package: qt6-serialbus
Architecture: any
Section: kde
-Provides: libqt6serialbus6, libqt6serialbus6-bin, libqt6serialbus6-plugins
-Depends: ${misc:Depends},
- ${shlibs:Depends}
+X-Neon-MergedPackage: true
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libqt6serialbus6-plugins (<< 6.3.1-3~)
+Replaces: libqt6serialbus6-plugins (<< 6.3.1-3~)
Pre-Depends: ${misc:Pre-Depends}
Description: Qt 6 Serial Bus library
Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -39,8 +41,13 @@ Description: Qt 6 Serial Bus library
Package: qt6-serialbus-dev
Architecture: any
Section: kde
-Provides: libqt6serialbus6-dev
-Depends: qt6-base-dev, qt6-serialbus (= ${binary:Version}), ${misc:Depends}
+X-Neon-MergedPackage: true
+Depends: qt6-base-dev,
+ qt6-serialbus (= ${binary:Version}),
+ qt6-serialport-dev,
+ ${misc:Depends}
+Breaks: libqt6serialbus6-dev (<< 6.4.1-2~)
+Replaces: libqt6serialbus6-dev (<< 6.4.1-2~)
Description: Qt 6 Serial Bus 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.
@@ -51,3 +58,15 @@ Description: Qt 6 Serial Bus development files
.
This package contains the header development files used for building Qt 6
applications using qtserialbus.
+
+Package: libqt6serialbus6
+Architecture: all
+Depends: qt6-serialbus
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6serialbus6-bin
+Architecture: all
+Depends: qt6-serialbus
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/qt6-serialbus-dev.install b/debian/qt6-serialbus-dev.install
old mode 100644
new mode 100755
index 05683fa..134a5b0
--- a/debian/qt6-serialbus-dev.install
+++ b/debian/qt6-serialbus-dev.install
@@ -1,3 +1,4 @@
+#!/usr/bin/dh-exec
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialBus/QCanBus
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialBus/QCanBusDevice
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialBus/QCanBusDeviceInfo
@@ -40,50 +41,52 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialBus/qmodbustcpclient.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialBus/qmodbustcpserver.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialBus/qserialbusglobal.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialBus/qtserialbus-config.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialBus/qtserialbusexports.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialBus/qtserialbusglobal.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSerialBus/qtserialbusversion.h
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtSerialBusTestsConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6PassThruCanBusPluginAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6PassThruCanBusPluginConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6PassThruCanBusPluginConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6PassThruCanBusPluginConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6PassThruCanBusPluginTargets-*.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6PassThruCanBusPluginTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6PeakCanBusPluginAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6PeakCanBusPluginConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6PeakCanBusPluginConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6PeakCanBusPluginConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6PeakCanBusPluginTargets-*.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6PeakCanBusPluginTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6SerialBusAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6SerialBusConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6SerialBusConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6SerialBusConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6SerialBusDependencies.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6SerialBusPlugins.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6SerialBusTargets-*.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6SerialBusTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6SerialBusVersionlessTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6SocketCanBusPluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6SocketCanBusPluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6SocketCanBusPluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6SocketCanBusPluginTargets-*.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6SocketCanBusPluginTargets.cmake
+[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6SocketCanBusPluginAdditionalTargetInfo.cmake
+[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6SocketCanBusPluginConfig.cmake
+[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6SocketCanBusPluginConfigVersion.cmake
+[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6SocketCanBusPluginConfigVersionImpl.cmake
+[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6SocketCanBusPluginTargets-*.cmake
+[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6SocketCanBusPluginTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6TinyCanBusPluginAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6TinyCanBusPluginConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6TinyCanBusPluginConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6TinyCanBusPluginConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6TinyCanBusPluginTargets-*.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6TinyCanBusPluginTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6VirtualCanBusPluginAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6VirtualCanBusPluginConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6VirtualCanBusPluginConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6VirtualCanBusPluginConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6VirtualCanBusPluginTargets-*.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBus/Qt6VirtualCanBusPluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBusTools/Qt6SerialBusToolsAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBusTools/Qt6SerialBusToolsConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBusTools/Qt6SerialBusToolsConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBusTools/Qt6SerialBusToolsDependencies.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBusTools/Qt6SerialBusToolsTargets-*.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBusTools/Qt6SerialBusToolsTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SerialBusTools/Qt6SerialBusToolsVersionlessTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/libQt6SerialBus.prl
usr/lib/${DEB_HOST_MULTIARCH}/libQt6SerialBus.so
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6serialbus_*_metatypes.json
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6SerialBus.pc
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_serialbus.pri
usr/share/qt6/modules/SerialBus.json
diff --git a/debian/qt6-serialbus.install b/debian/qt6-serialbus.install
index fe9b1ed..21c0d28 100644
--- a/debian/qt6-serialbus.install
+++ b/debian/qt6-serialbus.install
@@ -1,3 +1,3 @@
usr/lib/${DEB_HOST_MULTIARCH}/libQt6SerialBus.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/canbus/*
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/canbus
usr/lib/qt6/bin/canbusutil
diff --git a/debian/rules b/debian/rules
index 884c737..0d56bff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,14 +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 $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
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