[SCM] qtdeclarative packaging branch, master, updated. debian/5.2.1-4-2-g7a9f07a

[Lisandro Damián Nicanor Pérez]

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

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

    Rename QML modules as such: qtdeclarative5-dialogs-plugin → qml-module-qtquick-dialogs
---
 debian/changelog                                       |  5 +++++
 debian/control                                         | 15 +++++++++++++--
 debian/qml-module-qtquick-dialogs.lintian-overrides    |  1 +
 debian/qtdeclarative5-dialogs-plugin.lintian-overrides |  1 -
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e6ae54e..8a52f59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 qtdeclarative-opensource-src (5.2.1-5) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Rename QML modules as such, creating the proper transitional packages and
+    renaming the necessary files:
+    - qtdeclarative5-dialogs-plugin → qml-module-qtquick-dialogs.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 02 Apr 2014 12:19:25 -0300
 
 qtdeclarative-opensource-src (5.2.1-4) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 2d7766f..1520fd1 100644
--- a/debian/control
+++ b/debian/control
@@ -72,13 +72,24 @@ Description: Qt 5 Quick Test library
  This package contains the Qt Quick Test library for QtDeclarative module.
 
 Package: qtdeclarative5-dialogs-plugin
+Architecture: all
+Section: oldlibs
+Pre-Depends: ${misc:Pre-Depends}
+Depends: qml-module-qtquick-dialogs, ${misc:Depends}
+Description: transitional dummy package for Qt 5 Dialogs 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-qtquick-dialogs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: qtdeclarative5-privatewidgets-plugin,
          ${misc:Depends},
          ${shlibs:Depends}
-Description: Qt 5 Dialogs QML plugin
+Description: Qt 5 Dialogs 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.
  .
@@ -269,7 +280,7 @@ Architecture: any
 Multi-Arch: same
 Section: x11
 Pre-Depends: ${misc:Pre-Depends}
-Depends: qtdeclarative5-dialogs-plugin,
+Depends: qml-module-qtquick-dialogs,
          qtdeclarative5-localstorage-plugin,
          qtdeclarative5-models-plugin,
          qtdeclarative5-particles-plugin,
diff --git a/debian/qml-module-qtquick-dialogs.lintian-overrides b/debian/qml-module-qtquick-dialogs.lintian-overrides
new file mode 100644
index 0000000..eb988ca
--- /dev/null
+++ b/debian/qml-module-qtquick-dialogs.lintian-overrides
@@ -0,0 +1 @@
+qml-module-qtquick-dialogs.lintian-overrides: image-file-in-usr-lib
diff --git a/debian/qtdeclarative5-dialogs-plugin.lintian-overrides b/debian/qtdeclarative5-dialogs-plugin.lintian-overrides
deleted file mode 100644
index 128be18..0000000
--- a/debian/qtdeclarative5-dialogs-plugin.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-qtdeclarative5-dialogs-plugin: image-file-in-usr-lib

-- 
qtdeclarative packaging