[SCM] qtdeclarative packaging branch, master, updated. debian/5.2.1-4-5-g920e342

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=920e342

The following commit has been merged in the master branch:
commit 920e34232cdbd1e46000194119e8a1af89a13d7b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Apr 2 12:41:56 2014 -0300

    qtdeclarative5-folderlistmodel-plugin → qml-module-qt-labs-folderlistmodel.
---
 debian/changelog                                             |  1 +
 debian/control                                               | 12 +++++++++++-
 ...in.install => qml-module-qt-labs-folderlistmodel.install} |  0
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8a52f59..070871f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtdeclarative-opensource-src (5.2.1-5) UNRELEASED; urgency=medium
   * Rename QML modules as such, creating the proper transitional packages and
     renaming the necessary files:
     - qtdeclarative5-dialogs-plugin → qml-module-qtquick-dialogs.
+    - qtdeclarative5-folderlistmodel-plugin → qml-module-qt-labs-folderlistmodel.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 02 Apr 2014 12:19:25 -0300
 
diff --git a/debian/control b/debian/control
index 136359c..a8032bc 100644
--- a/debian/control
+++ b/debian/control
@@ -95,11 +95,21 @@ Description: Qt 5 Dialogs QML module
  The Dialogs module provides FileDialog and ColorDialog types.
 
 Package: qtdeclarative5-folderlistmodel-plugin
+Architecture: all
+Section: oldlibs
+Depends: qml-module-qt-labs-folderlistmodel, ${misc:Depends}
+Description: transitional dummy package for Qt 5 folderlistmodel 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-qt-labs-folderlistmodel
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 folderlistmodel QML plugin
+Description: Qt 5 folderlistmodel 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.
  .
diff --git a/debian/qtdeclarative5-folderlistmodel-plugin.install b/debian/qml-module-qt-labs-folderlistmodel.install
similarity index 100%
rename from debian/qtdeclarative5-folderlistmodel-plugin.install
rename to debian/qml-module-qt-labs-folderlistmodel.install

-- 
qtdeclarative packaging