[neon/qt6/qt6-location/Neon/release] debian: fix the name of the package

Jonathan Esk-Riddell null at kde.org
Wed Jul 12 15:46:12 BST 2023


Git commit 3f0281a5835ea0c2a7e4b34cfe874e5b14f80a39 by Jonathan Esk-Riddell.
Committed on 12/07/2023 at 14:45.
Pushed by jriddell into branch 'Neon/release'.

fix the name of the package

M  +12   -12   debian/changelog
M  +10   -10   debian/control
M  +16   -16   debian/copyright
M  +8    -8    debian/not-installed
M  +11   -11   debian/qt6-location-dev.install
M  +1    -1    debian/qt6-location.install

https://invent.kde.org/neon/qt6/qt6-location/-/commit/3f0281a5835ea0c2a7e4b34cfe874e5b14f80a39

diff --git a/debian/changelog b/debian/changelog
index 9b1e680..8df293f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-qt6-positioning (6.5.1-0neon) UNRELEASED; urgency=medium
+qt6-location (6.5.1-0neon) UNRELEASED; urgency=medium
 
   * New release
 
  -- Patrick Franz <deltaone at debian.org>  Mon, 03 Apr 2023 16:58:30 +0100
 
-qt6-positioning (6.4.2-1) experimental; urgency=medium
+qt6-location (6.4.2-1) experimental; urgency=medium
 
   [ Patrick Franz ]
   * New upstream release (6.4.2).
@@ -14,7 +14,7 @@ qt6-positioning (6.4.2-1) experimental; urgency=medium
 
  -- Patrick Franz <deltaone at debian.org>  Wed, 16 Nov 2022 07:08:41 +0100
 
-qt6-positioning (6.4.0-1) experimental; urgency=medium
+qt6-location (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.
@@ -29,14 +29,14 @@ qt6-positioning (6.4.0-1) experimental; urgency=medium
 
  -- Patrick Franz <deltaone at debian.org>  Thu, 13 Oct 2022 12:29:22 +0200
 
-qt6-positioning (6.3.1-2) unstable; urgency=medium
+qt6-location (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
+qt6-location (6.3.1-1) experimental; urgency=medium
 
   [ Patrick Franz ]
   * New upstream release (6.3.1).
@@ -47,7 +47,7 @@ qt6-positioning (6.3.1-1) experimental; urgency=medium
 
  -- Patrick Franz <deltaone at debian.org>  Sun, 17 Jul 2022 03:59:07 +0200
 
-qt6-positioning (6.3.0-1) experimental; urgency=medium
+qt6-location (6.3.0-1) experimental; urgency=medium
 
   [ Patrick Franz ]
   * New upstream release (6.3.0).
@@ -57,14 +57,14 @@ qt6-positioning (6.3.0-1) experimental; urgency=medium
 
  -- Patrick Franz <deltaone at debian.org>  Tue, 14 Jun 2022 21:24:10 +0200
 
-qt6-positioning (6.2.4-3) unstable; urgency=medium
+qt6-location (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
+qt6-location (6.2.4-2) experimental; urgency=medium
 
   * Team upload.
   * Backport upstream commit deaf18f77fc67d7be6534843a009a47e8df40eb4 to enable
@@ -74,7 +74,7 @@ qt6-positioning (6.2.4-2) experimental; urgency=medium
 
  -- Pino Toscano <pino at debian.org>  Sat, 16 Apr 2022 06:06:34 +0200
 
-qt6-positioning (6.2.4-1) experimental; urgency=medium
+qt6-location (6.2.4-1) experimental; urgency=medium
 
   [ Patrick Franz ]
   * New upstream release (6.2.4).
@@ -82,21 +82,21 @@ qt6-positioning (6.2.4-1) experimental; urgency=medium
 
  -- Patrick Franz <deltaone at debian.org>  Wed, 30 Mar 2022 20:49:29 +0200
 
-qt6-positioning (6.2.2-3) unstable; urgency=medium
+qt6-location (6.2.2-3) unstable; urgency=medium
 
   [ Patrick Franz ]
   * Upload to unstable.
 
  -- Patrick Franz <deltaone at debian.org>  Tue, 15 Feb 2022 22:02:06 +0100
 
-qt6-positioning (6.2.2-2) experimental; urgency=medium
+qt6-location (6.2.2-2) experimental; urgency=medium
 
   [ Patrick Franz ]
   * Update symbols from buildlogs.
 
  -- Patrick Franz <deltaone at debian.org>  Mon, 06 Dec 2021 00:32:37 +0100
 
-qt6-positioning (6.2.2-1) experimental; urgency=medium
+qt6-location (6.2.2-1) experimental; urgency=medium
 
   * Initial release (Closes: #999636)
 
diff --git a/debian/control b/debian/control
index 6de1e9d..4e6dc8f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: qt6-positioning
+Source: qt6-location
 Section: libs
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
@@ -21,8 +21,8 @@ Build-Depends: cmake,
                zlib1g-dev
 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
+Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-location
+Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-location.git
 Rules-Requires-Root: no
 
 Package: qt6-location
@@ -30,8 +30,8 @@ Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libqt6positioning6 (= ${binary:Version}),
-         libqt6positioning6-plugins (= ${binary:Version}),
+Depends: libqt6location6 (= ${binary:Version}),
+         libqt6location6-plugins (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Qt 6 Positioning library
@@ -55,31 +55,31 @@ 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
+Package: libqt6location6
 Architecture: all
 Depends: qt6-location
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: libqt6positioningquick6
+Package: libqt6locationquick6
 Architecture: all
 Depends: qt6-location
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: libqt6positioning6-plugins
+Package: libqt6location6-plugins
 Architecture: all
 Depends: qt6-location
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qml6-module-qtpositioning
+Package: qml6-module-qtlocation
 Architecture: all
 Depends: qt6-location
 Description: Dummy transitional
  Transitional dummy package.
 
-Package: qt6-positioning-dev
+Package: qt6-location-dev
 Architecture: all
 Depends: qt6-location-dev
 Description: Dummy transitional
diff --git a/debian/copyright b/debian/copyright
index ee73a6e..d8f0f75 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: qtpositioning-everywhere-src
+Upstream-Name: qtlocation-everywhere-src
 Source: https://download.qt.io/archive/qt/*/submodules/
 
 Files: *
@@ -9,7 +9,7 @@ Copyright: 2015-2021 The Qt Company Ltd.
 License: LGPL-3 or GPL-2
 
 Files: examples/*
-       src/positioning/doc/snippets/*
+       src/location/doc/snippets/*
 Copyright: 2017 The Qt Company Ltd.
 License: BSD-3-clause
 
@@ -23,21 +23,21 @@ Files: *.qdoc
 Copyright: 2017-2019 The Qt Company Ltd.
 License: GFDL-NIV-1.3
 
-Files: examples/positioning/weatherinfo/icons/weather-fog.png
-       examples/positioning/weatherinfo/icons/weather-haze.png
-       examples/positioning/weatherinfo/icons/weather-icy.png
-       examples/positioning/weatherinfo/icons/weather-sleet.png
-       examples/positioning/weatherinfo/icons/weather-sunny.png
-       examples/positioning/weatherinfo/icons/weather-sunny-very-few-clouds.png
-       examples/positioning/weatherinfo/icons/weather-thundershower.png
+Files: examples/location/weatherinfo/icons/weather-fog.png
+       examples/location/weatherinfo/icons/weather-haze.png
+       examples/location/weatherinfo/icons/weather-icy.png
+       examples/location/weatherinfo/icons/weather-sleet.png
+       examples/location/weatherinfo/icons/weather-sunny.png
+       examples/location/weatherinfo/icons/weather-sunny-very-few-clouds.png
+       examples/location/weatherinfo/icons/weather-thundershower.png
 Copyright: DarKobra (C Stark)
 License: public-domain
 
-Files: examples/positioning/weatherinfo/icons/weather-few-clouds.png
-       examples/positioning/weatherinfo/icons/weather-overcast.png
-       examples/positioning/weatherinfo/icons/weather-showers.png
-       examples/positioning/weatherinfo/icons/weather-snow.png
-       examples/positioning/weatherinfo/icons/weather-storm.png
+Files: examples/location/weatherinfo/icons/weather-few-clouds.png
+       examples/location/weatherinfo/icons/weather-overcast.png
+       examples/location/weatherinfo/icons/weather-showers.png
+       examples/location/weatherinfo/icons/weather-snow.png
+       examples/location/weatherinfo/icons/weather-storm.png
 Copyright: Tango Project contributors
 License: public-domain
 
@@ -54,8 +54,8 @@ Copyright: 2009-2010, Poly2Tri Contributors
 License: BSD-3-clause
 
 Files: src/plugins/position/winrt/*
-       src/positioningquick/qdeclarativepluginparameter_p.h
-       src/positioningquick/qdeclarativepluginparameter.cpp
+       src/locationquick/qdeclarativepluginparameter_p.h
+       src/locationquick/qdeclarativepluginparameter.cpp
 Copyright: 2015-2019 The Qt Company Ltd.
 License: LGPL-3 or GPL-2+
 
diff --git a/debian/not-installed b/debian/not-installed
index 2b254f2..82c171d 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,10 +1,10 @@
 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
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6locationquickpluginAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6locationquickpluginConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6locationquickpluginConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6locationquickpluginConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6locationquickpluginTargets-none.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6locationquickpluginTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_location_private.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_locationquick_private.pri
diff --git a/debian/qt6-location-dev.install b/debian/qt6-location-dev.install
index aa97633..f8ea042 100644
--- a/debian/qt6-location-dev.install
+++ b/debian/qt6-location-dev.install
@@ -35,16 +35,16 @@ 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/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/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/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
@@ -88,11 +88,11 @@ 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}/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_positioning.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_positioningquick.pri
+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
diff --git a/debian/qt6-location.install b/debian/qt6-location.install
index 313d8b8..7ec3ff0 100644
--- a/debian/qt6-location.install
+++ b/debian/qt6-location.install
@@ -3,6 +3,6 @@ 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/liblocationquickplugin.so
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtPositioning/plugins.qmltypes
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtPositioning/qmldir


More information about the Neon-commits mailing list