[SCM] qtquickcontrols packaging branch, experimental, updated. debian/5.2.1-4

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit e34fde76655f37eada4e1ab3d29f4299330c4c87
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Apr 2 19:28:46 2014 -0300

    Rename QML packages.
---
 debian/changelog                                   |  3 ++
 debian/control                                     | 37 +++++++++++++++-------
 ...install => qml-module-qtquick-controls.install} |  0
 ... qml-module-qtquick-controls.lintian-overrides} |  0
 ....install => qml-module-qtquick-layouts.install} |  0
 5 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4876795..f964046 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qtquickcontrols-opensource-src (5.2.1-4) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Add qtdeclarative5-window-plugin as a qtdeclarative5-controls-plugin
     dependency.
+  * Rename QML packages with proper Break+Replaces and files renaming:
+    - qtdeclarative5-controls-plugin → qml-module-qtquick-controls.
+    - qtdeclarative5-quicklayouts-plugin → qml-module-qtquick-layouts.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 28 Mar 2014 14:32:00 -0300
 
diff --git a/debian/control b/debian/control
index 9394fb8..369d22f 100644
--- a/debian/control
+++ b/debian/control
@@ -21,39 +21,52 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtquickcontrols.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qtquickcontrols.git
 
 Package: qtdeclarative5-controls-plugin
+Architecture: all
+Section: oldlibs
+Depends: ${misc:Depends}, qml-module-qtquick-controls
+Description: transitional dummy package for Qt 5 Quick Controls 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-controls
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: libqt5qml5,
-         qtdeclarative5-quicklayouts-plugin (= ${binary:Version}),
-         qtdeclarative5-window-plugin,
+         qml-module-qtquick-layouts (= ${binary:Version}),
+         qml-module-qtquick-window2,
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: libqt5qml-quickcontrols (<< 5.1.1-2~)
-Replaces: libqt5qml-quickcontrols (<< 5.1.1-2~)
-Description: Qt 5 Quick Controls module plugin
+Breaks: libqt5qml-quickcontrols (<< 5.1.1-2~), qtdeclarative5-controls-plugin (<< 5.2.1-4~)
+Replaces: libqt5qml-quickcontrols (<< 5.1.1-2~), qtdeclarative5-controls-plugin (<< 5.2.1-4~)
+Description: Qt 5 Quick Controls 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.
  .
  The Qt Quick Controls module provides a set of controls that can be used to
  build complete interfaces in Qt Quick.
 
-Package: libqt5qml-quickcontrols
-Architecture: all
-Depends: qtdeclarative5-controls-plugin, ${misc:Depends}
+Package: qtdeclarative5-quicklayouts-plugin
 Section: oldlibs
-Description: transitional dummy package for Qt 5 Quick Controls module plugin
+Architecture: all
+Depends: ${misc:Depends}, qml-module-qtquick-layouts
+Description: transitional dummy package for Qt 5 Quick Layouts 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.
+ This is a transitional dummy package for qml-module-qtquick-layouts
+ which can be safely removed.
 
-Package: qtdeclarative5-quicklayouts-plugin
+Package: qml-module-qtquick-layouts
 Section: libdevel
 Multi-Arch: same
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 Quick Layouts module plugin
+Breaks: qtdeclarative5-quicklayouts-plugin (<< 5.2.1-4~)
+Replaces: qtdeclarative5-quicklayouts-plugin (<< 5.2.1-4~)
+Description: Qt 5 Quick Layouts 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-controls-plugin.install b/debian/qml-module-qtquick-controls.install
similarity index 100%
rename from debian/qtdeclarative5-controls-plugin.install
rename to debian/qml-module-qtquick-controls.install
diff --git a/debian/qtdeclarative5-controls-plugin.lintian-overrides b/debian/qml-module-qtquick-controls.lintian-overrides
similarity index 100%
rename from debian/qtdeclarative5-controls-plugin.lintian-overrides
rename to debian/qml-module-qtquick-controls.lintian-overrides
diff --git a/debian/qtdeclarative5-quicklayouts-plugin.install b/debian/qml-module-qtquick-layouts.install
similarity index 100%
rename from debian/qtdeclarative5-quicklayouts-plugin.install
rename to debian/qml-module-qtquick-layouts.install

-- 
qtquickcontrols packaging