[SCM] qtlocation packaging branch, master, updated. debian/5.2.1-2-2-g6ebc579

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtlocation.git;a=commitdiff;h=6ebc579

The following commit has been merged in the master branch:
commit 6ebc5797ce007bc8d14d08607c6073f03b8ff253
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Apr 2 19:10:14 2014 -0300

    Rename the QML module.
---
 debian/changelog                                       |  5 +++++
 debian/control                                         | 18 +++++++++++++++---
 ...tion-plugin.install => qml-module-location.install} |  0
 ...plugin.install => qml-module-qtpositioning.install} |  0
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fddda14..1bf8592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 qtlocation-opensource-src (5.2.1-3) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Rename the QML module from qtdeclarative5-qtlocation-plugin to
+    qml-module-location, adding proper Break+Replaces and renaming necessary files.
+    Also rename the location QML module files, which is currently not beiong built.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 02 Apr 2014 19:01:05 -0300
 
 qtlocation-opensource-src (5.2.1-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 6aff246..948977f 100644
--- a/debian/control
+++ b/debian/control
@@ -46,15 +46,27 @@ Description: Qt Positioning module - position plugins
  This package contains Qt Positioning plugins.
 
 Package: qtdeclarative5-qtpositioning-plugin
+Architecture: all
+Section: oldlibs
+Depends: ${misc:Depends}, qml-module-qtpositioning
+Description: transitional dummy package for Qt Positioning QML module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This is a transitional dummy package which can be safely removed.
+
+Package: qml-module-qtpositioning
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libqt5positioning5-plugins, ${misc:Depends}, ${shlibs:Depends}
-Description: Qt Positioning module - QML plugin
+Depends: libqt5positioning5-plugins (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Breaks: qtdeclarative5-qtpositioning-plugin (<< 5.2.1-3~)
+Replaces: qtdeclarative5-qtpositioning-plugin (<< 5.2.1-3~)
+Description: Qt Positioning QML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This package contains the Qt Positioning QML plugin for Qt Declarative.
+ This package contains the Qt Positioning QML module for Qt Declarative.
 
 Package: qtpositioning5-dev
 Architecture: any
diff --git a/debian/qtdeclarative5-qtlocation-plugin.install b/debian/qml-module-location.install
similarity index 100%
rename from debian/qtdeclarative5-qtlocation-plugin.install
rename to debian/qml-module-location.install
diff --git a/debian/qtdeclarative5-qtpositioning-plugin.install b/debian/qml-module-qtpositioning.install
similarity index 100%
rename from debian/qtdeclarative5-qtpositioning-plugin.install
rename to debian/qml-module-qtpositioning.install

-- 
qtlocation packaging