[neon/qt6/qt6-positioning/Neon/release] debian: merge stable into release for 6.5.2
Carlos De Maine
null at kde.org
Fri Jul 21 01:28:00 BST 2023
Git commit 5ed0c0debd913b6c133a3e30949c829a6ea4722b by Carlos De Maine.
Committed on 21/07/2023 at 00:27.
Pushed by carlosdem into branch 'Neon/release'.
merge stable into release for 6.5.2
M +1 -1 debian/changelog
M +1 -0 debian/control
M +0 -10 debian/not-installed
M +9 -90 debian/qt6-positioning-dev.install
M +2 -6 debian/qt6-positioning.install
M +3 -1 debian/watch
https://invent.kde.org/neon/qt6/qt6-positioning/-/commit/5ed0c0debd913b6c133a3e30949c829a6ea4722b
diff --git a/debian/changelog b/debian/changelog
index 9b1e680..f2d7d03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qt6-positioning (6.5.1-0neon) UNRELEASED; urgency=medium
+qt6-positioning (6.5.2-0neon) UNRELEASED; urgency=medium
* New release
diff --git a/debian/control b/debian/control
index e42803e..2634b0e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ 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,
debhelper-compat (= 13),
+ libgconf2-dev,
libgl-dev,
libssl-dev,
libvulkan-dev [linux-any],
diff --git a/debian/not-installed b/debian/not-installed
index 2b254f2..e69de29 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,10 +0,0 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/6.*
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioningQuick/6.*
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6positioningquickpluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6positioningquickpluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6positioningquickpluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6positioningquickpluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6positioningquickpluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6positioningquickpluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_positioning_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_positioningquick_private.pri
diff --git a/debian/qt6-positioning-dev.install b/debian/qt6-positioning-dev.install
index aa97633..0d4be78 100644
--- a/debian/qt6-positioning-dev.install
+++ b/debian/qt6-positioning-dev.install
@@ -1,98 +1,17 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/QGeoAddress
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/QGeoAreaMonitorInfo
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/QGeoAreaMonitorSource
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/QGeoCircle
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/QGeoCoordinate
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/QGeoLocation
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/QGeoPath
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/QGeoPolygon
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/QGeoPositionInfo
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/QGeoPositionInfoSource
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/QGeoPositionInfoSourceFactory
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/QGeoRectangle
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/QGeoSatelliteInfo
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/QGeoSatelliteInfoSource
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/QGeoShape
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/QNmeaPositionInfoSource
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/QNmeaSatelliteInfoSource
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/QtPositioning
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/QtPositioningDepends
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/QtPositioningVersion
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qgeoaddress.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qgeoareamonitorinfo.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qgeoareamonitorsource.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qgeocircle.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qgeocoordinate.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qgeolocation.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qgeopath.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qgeopolygon.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qgeopositioninfo.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qgeopositioninfosource.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qgeopositioninfosourcefactory.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qgeorectangle.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qgeosatelliteinfo.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qgeosatelliteinfosource.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qgeoshape.h
-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/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioningQuick/
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindGconf.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/FindGypsy.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtPositioningTestsConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Bundled_Clip2Tri/Qt6Bundled_Clip2TriDependencies.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6PositioningAdditionalTargetInfo.cmake
-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
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryGeoclue2PluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryGeoclue2PluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryGeoclue2PluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryGeoclue2PluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryGeoclue2PluginTargets-*.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryGeoclue2PluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryNmeaPluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryNmeaPluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryNmeaPluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryNmeaPluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryNmeaPluginTargets-*.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryNmeaPluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryPollPluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryPollPluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryPollPluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryPollPluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryPollPluginTargets-*.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/Qt6QGeoPositionInfoSourceFactoryPollPluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6PositioningQuick/Qt6PositioningQuickAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6PositioningQuick/Qt6PositioningQuickConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6PositioningQuick/Qt6PositioningQuickConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6PositioningQuick/Qt6PositioningQuickConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6PositioningQuick/Qt6PositioningQuickDependencies.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6PositioningQuick/Qt6PositioningQuickTargets-*.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6PositioningQuick/Qt6PositioningQuickTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6PositioningQuick/Qt6PositioningQuickVersionlessTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Positioning/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6PositioningQuick/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/
usr/lib/${DEB_HOST_MULTIARCH}/libQt6Positioning.prl
usr/lib/${DEB_HOST_MULTIARCH}/libQt6Positioning.so
usr/lib/${DEB_HOST_MULTIARCH}/libQt6PositioningQuick.prl
usr/lib/${DEB_HOST_MULTIARCH}/libQt6PositioningQuick.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/qt6positioning_*_metatypes.json
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/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/lib/${DEB_HOST_MULTIARCH}/qt6/modules/Positioning.json
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/PositioningQuick.json
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/
diff --git a/debian/qt6-positioning.install b/debian/qt6-positioning.install
index 313d8b8..eb82c23 100644
--- a/debian/qt6-positioning.install
+++ b/debian/qt6-positioning.install
@@ -1,8 +1,4 @@
usr/lib/${DEB_HOST_MULTIARCH}/libQt6Positioning.so.*
usr/lib/${DEB_HOST_MULTIARCH}/libQt6PositioningQuick.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/position/libqtposition_geoclue2.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/position/libqtposition_nmea.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/position/libqtposition_positionpoll.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtPositioning/libpositioningquickplugin.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtPositioning/plugins.qmltypes
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtPositioning/qmldir
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/position/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtPositioning/
\ No newline at end of file
diff --git a/debian/watch b/debian/watch
index 9e46554..1dec594 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
version=4
-https://download.qt.io/archive/qt/([\d\.]*)/([\d\.]*)/submodules/qtpositioning-everywhere-src-(.*)\.tar\.xz
+opts=uversionmangle=s/-/~/ \
+https://qt-mirror.dannhauer.de/official_releases/qt/([\d\.]+)/([\d\.]+)(\d)/submodules/qtpositioning-everywhere-src-([\d\.]+\d).tar.xz
+
More information about the Neon-commits
mailing list