[SCM] qtlocation packaging branch, location-packages, updated. debian/5.2.1-3-9-g148690f

[Dmitry Shachnev]

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

The following commit has been merged in the location-packages branch:
commit 148690f486337e54f26bbfc6ef1e3a81f2f47160
Merge: 6731b54c15670dc2fa7ad233041c85c8733dca73 ff29976f37314e49c8f75d003da4e6f7e6c4b1a4
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Apr 30 16:20:54 2014 +0400

    Merge branch 'master' into location-packages.

 debian/changelog                                     | 14 ++++++++++++--
 debian/control                                       | 20 +++++++++++++++++---
 ...on-plugin.install => qml-module-location.install} |  0
 ...ugin.install => qml-module-qtpositioning.install} |  0
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index fb59cb9,f01e4c8..d45e545
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,12 +1,23 @@@
- qtlocation-opensource-src (5.2.1-3) UNRELEASED; urgency=medium
++qtlocation-opensource-src (5.2.1-4) UNRELEASED; urgency=medium
 +
 +  [ Dmitry Shachnev ]
 +  * Rename the -doc, -dbg and -examples packages to match the source
 +    package name, for consistency with other Qt 5 modules.
 +  * Build new packages for qtlocation module.
 +  * Pass ‘-screen 0 640x480x24’ to Xvfb server when running tests,
 +    needed for executing OpenGL/QML tests on the builders.
 +
-  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 23 Mar 2014 13:37:08 +0400
++ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 30 Apr 2014 16:19:31 +0400
++
+ qtlocation-opensource-src (5.2.1-3) unstable; urgency=medium
+ 
+   * 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 being
+      built.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Thu, 03 Apr 2014 12:14:03 -0300
  
  qtlocation-opensource-src (5.2.1-2) unstable; urgency=medium
  
diff --cc debian/control
index d55c7bf,1ac29d2..8caa90c
--- a/debian/control
+++ b/debian/control
@@@ -70,20 -45,17 +70,30 @@@ Description: Qt Positioning module - po
   .
   This package contains Qt Positioning plugins.
  
 +Package: qtdeclarative5-qtlocation-plugin
 +Architecture: any
 +Multi-Arch: same
 +Pre-Depends: ${misc:Pre-Depends}
 +Depends: libqt5location5-plugins,
 +         ${misc:Depends},
 +         ${shlibs:Depends},
 +Description: Qt Location module - QML plugin
 + 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 Location QML plugin for Qt Declarative.
 +
  Package: qtdeclarative5-qtpositioning-plugin
+ Architecture: all
+ Section: oldlibs
+ Depends: qml-module-qtpositioning, ${misc:Depends}
+ 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}
@@@ -92,23 -68,8 +106,23 @@@ Description: Qt Positioning QML modul
   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: qtlocation5-dev
 +Architecture: any
 +Section: libdevel
 +Depends: libqt5location5 (= ${binary:Version}),
 +         libqt5location5-plugins (= ${binary:Version}),
 +         qtbase5-dev,
 +         qtdeclarative5-dev,
 +         ${misc:Depends}
 +Description: Qt 5 Location development files
 + 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 header development files used for building Qt 5
 + applications using Qt Location library.
 +
  Package: qtpositioning5-dev
  Architecture: any
  Section: libdevel

-- 
qtlocation packaging