[neon/qt6/qt6-positioning/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:59 GMT 2022
Git commit 24ef0e942c33124ddfbe88429a1853694055b45f 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 +82 -3 debian/changelog
M +34 -11 debian/control
M +5 -0 debian/qt6-positioning-dev.install
M +2 -1 debian/rules
https://invent.kde.org/neon/qt6/qt6-positioning/commit/24ef0e942c33124ddfbe88429a1853694055b45f
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 8024ce6..7c296c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,87 @@
-qt6-positioning (6.2.3-0neon) UNRELEASED; urgency=medium
+qt6-positioning (6.4.1-1) experimental; urgency=medium
- * New release
+ [ Patrick Franz ]
+ * New upstream release (6.4.1).
+ * Bump Qt B-Ds to 6.4.1.
+ * Update symbols from buildlogs.
+ * Enable link time optimization.
+
+ -- Patrick Franz <deltaone at debian.org> Wed, 16 Nov 2022 07:08:41 +0100
+
+qt6-positioning (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.
+ * Remove patches as they have been applied upstream.
+ * Update list of installed files.
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Thu, 13 Oct 2022 12:29:22 +0200
+
+qt6-positioning (6.3.1-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Mon, 15 Aug 2022 19:22:59 +0200
+
+qt6-positioning (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 patches.
+ * Update list of installed files.
+
+ -- Patrick Franz <deltaone at debian.org> Sun, 17 Jul 2022 03:59:07 +0200
+
+qt6-positioning (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> Tue, 14 Jun 2022 21:24:10 +0200
+
+qt6-positioning (6.2.4-3) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Fri, 22 Apr 2022 20:06:57 +0200
+
+qt6-positioning (6.2.4-2) experimental; urgency=medium
+
+ * Team upload.
+ * Backport upstream commit deaf18f77fc67d7be6534843a009a47e8df40eb4 to enable
+ the geoclue2 plugin also on GNU/Hurd; patch
+ upstream_CMake-enable-geoclue2-also-on-GNU-Hurd.patch.
+ * Update symbols files from the logs of buildds.
+
+ -- Pino Toscano <pino at debian.org> Sat, 16 Apr 2022 06:06:34 +0200
+
+qt6-positioning (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:49:29 +0200
+
+qt6-positioning (6.2.2-3) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
- -- Jonathan Riddell <jr at jriddell.org> Wed, 02 Feb 2022 15:13:49 +0000
+ -- Patrick Franz <deltaone at debian.org> Tue, 15 Feb 2022 22:02:06 +0100
qt6-positioning (6.2.2-2) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index adff07d..d24fb3f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,22 +3,22 @@ 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,
- qt6-serialport-dev (>= 6.2.1~),
+ libqt6serialport6-dev (>= 6.4.1~),
libssl-dev,
libvulkan-dev [linux-any],
ninja-build,
pkg-config,
pkg-kde-tools,
- qt6-base-dev (>= 6.2.1+dfsg~),
- qt6-declarative-dev (>= 6.2.1+dfsg~),
+ qt6-base-dev (>= 6.4.1+dfsg~),
+ qt6-declarative-dev (>= 6.4.1+dfsg~),
rapidjson-dev (>= 1.1.0),
xauth <!nocheck>,
xvfb <!nocheck>,
zlib1g-dev
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
Homepage: https://www.qt.io/developers/
Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-positioning
Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-positioning.git
@@ -27,12 +27,11 @@ Rules-Requires-Root: no
Package: qt6-positioning
Architecture: any
Section: kde
-Provides: libqt6positioning6,
- libqt6positioning6-plugins,
- libqt6positioningquick6,
- qml6-module-qtpositioning
+X-Neon-MergedPackage: true
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
+Depends: libqt6positioning6 (= ${binary:Version}),
+ libqt6positioning6-plugins (= ${binary:Version}),
+ ${misc:Depends},
${shlibs:Depends}
Description: Qt 6 Positioning library
Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -43,7 +42,7 @@ Description: Qt 6 Positioning library
Package: qt6-positioning-dev
Architecture: any
Section: kde
-Provides: qt6-positioning-dev
+X-Neon-MergedPackage: true
Depends: qt6-base-dev,
qt6-declarative-dev,
qt6-positioning (= ${binary:Version}),
@@ -54,3 +53,27 @@ Description: Qt 6 Positioning - development files
.
This package contains the header development files used for building Qt 6
applications using Qt 6 Positioning library.
+
+Package: libqt6positioning6
+Architecture: all
+Depends: qt6-positioning
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6positioningquick6
+Architecture: all
+Depends: qt6-positioning
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6positioning6-plugins
+Architecture: all
+Depends: qt6-positioning
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qtpositioning
+Architecture: all
+Depends: qt6-positioning
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/qt6-positioning-dev.install b/debian/qt6-positioning-dev.install
index 55027fb..3c30bcd 100644
--- a/debian/qt6-positioning-dev.install
+++ b/debian/qt6-positioning-dev.install
@@ -37,11 +37,13 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qnmeapositioninfosource.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qnmeasatelliteinfosource.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qpositioningglobal.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qtpositioning-config.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qtpositioningexports.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qtpositioningversion.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioningQuick/QtPositioningQuick
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioningQuick/QtPositioningQuickDepends
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioningQuick/QtPositioningQuickVersion
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioningQuick/qpositioningquickglobal.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioningQuick/qtpositioningquickexports.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioningQuick/qtpositioningquickversion.h
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindGconf.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindGypsy.cmake
@@ -52,6 +54,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6PositioningConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6PositioningConfigVersion.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6PositioningConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6PositioningDependencies.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6PositioningPlugins.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6PositioningTargets-*.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6PositioningTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6PositioningVersionlessTargets.cmake
@@ -87,6 +90,8 @@ usr/lib/${DEB_HOST_MULTIARCH}/libQt6PositioningQuick.prl
usr/lib/${DEB_HOST_MULTIARCH}/libQt6PositioningQuick.so
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6positioning_*_metatypes.json
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6positioningquick_*_metatypes.json
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6Positioning.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6PositioningQuick.pc
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_positioning.pri
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_positioningquick.pri
usr/share/qt6/modules/Positioning.json
diff --git a/debian/rules b/debian/rules
index 149018d..e2cde0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,14 @@
#!/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 $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
override_dh_auto_configure:
dh_auto_configure -- \
+ --log-level=STATUS \
-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
execute_after_dh_auto_install:
More information about the Neon-commits
mailing list