[neon/qt6/qt6-location/Neon/release] debian: merge stable into release for 6.5.2 release
Carlos De Maine
null at kde.org
Fri Jul 21 00:55:41 BST 2023
Git commit 14f9f9e5165bfcd3ffda5041d79ce80871219725 by Carlos De Maine.
Committed on 20/07/2023 at 23:55.
Pushed by carlosdem into branch 'Neon/release'.
merge stable into release for 6.5.2 release
M +1 -1 debian/changelog
M +4 -4 debian/control
M +8 -98 debian/qt6-location-dev.install
M +5 -8 debian/qt6-location.install
M +2 -1 debian/watch
https://invent.kde.org/neon/qt6/qt6-location/-/commit/14f9f9e5165bfcd3ffda5041d79ce80871219725
diff --git a/debian/changelog b/debian/changelog
index 8df293f..dfdc236 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qt6-location (6.5.1-0neon) UNRELEASED; urgency=medium
+qt6-location (6.5.2-0neon) UNRELEASED; urgency=medium
* New release
diff --git a/debian/control b/debian/control
index 628d6a9..2054e7a 100644
--- a/debian/control
+++ b/debian/control
@@ -13,10 +13,10 @@ Build-Depends: cmake,
ninja-build,
pkg-config,
pkg-kde-tools,
- qt6-base-dev (>= 6.4.2+dfsg~),
- qt6-declarative-dev (>= 6.4.2+dfsg~),
- qt6-serialport-dev (>= 6.4.2),
- rapidjson-dev (>= 1.1.0),
+ qt6-base-dev,
+ qt6-declarative-dev,
+ qt6-positioning-dev,
+ qt6-shadertools-dev,
xauth <!nocheck>,
xvfb <!nocheck>,
zlib1g-dev
diff --git a/debian/qt6-location-dev.install b/debian/qt6-location-dev.install
index f8ea042..901844c 100644
--- a/debian/qt6-location-dev.install
+++ b/debian/qt6-location-dev.install
@@ -1,98 +1,8 @@
-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/qlocationglobal.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qtlocation-config.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qtlocationexports.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioning/qtlocationversion.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/qlocationquickglobal.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioningQuick/qtlocationquickexports.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtPositioningQuick/qtlocationquickversion.h
-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}/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/qt6location_*_metatypes.json
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/qt6locationquick_*_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_location.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_locationquick.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/Positioning.json
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/PositioningQuick.json
+usr/include/
+usr/lib/*/cmake/
+usr/lib/*/libQt6Location.prl
+usr/lib/*/libQt6Location.so
+usr/lib/*/pkgconfig/
+usr/lib/*/qt6/metatypes/
+usr/lib/*/qt6/mkspecs/
+usr/lib/*/qt6/modules/
diff --git a/debian/qt6-location.install b/debian/qt6-location.install
index 7ec3ff0..8133ad7 100644
--- a/debian/qt6-location.install
+++ b/debian/qt6-location.install
@@ -1,8 +1,5 @@
-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/liblocationquickplugin.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtPositioning/plugins.qmltypes
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtPositioning/qmldir
+usr/lib/*/libQt6Location.so.6
+usr/lib/*/libQt6Location.so.6*
+usr/lib/*/qt6/plugins/geoservices/libqtgeoservices_itemsoverlay.so
+usr/lib/*/qt6/plugins/geoservices/libqtgeoservices_osm.so
+usr/lib/*/qt6/qml/QtLocation/libdeclarative_locationplugin.so
diff --git a/debian/watch b/debian/watch
index 48bcc6b..5930703 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
version=4
-https://qt-mirror.dannhauer.de/development_releases/qt/6.6/6.6.0-beta1/submodules/qtlocation-everywhere-src-(6.6.0-beta1).tar.xz
+opts=uversionmangle=s/-/~/ \
+https://qt-mirror.dannhauer.de/official_releases/qt/([\d\.]+)/([\d\.]+)(\d)/submodules/qtlocation-everywhere-src-([\d\.]+\d).tar.xz
\ No newline at end of file
More information about the Neon-commits
mailing list