[SCM] qtmultimedia packaging branch, master, updated. debian/5.2.1-2-3-g67ebe0d

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 67ebe0d6728c6b24bfaaa59cdbef1b24f1f88ffe
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Apr 2 16:43:47 2014 -0300

    Rename QML packages.
---
 debian/changelog                                   |  3 ++
 debian/control                                     | 40 ++++++++++++++++++----
 ...in.install => qml-module-qtaudioengine.install} |  0
 ...gin.install => qml-module-qtmultimedia.install} |  0
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0dc7100..034e57e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qtmultimedia-opensource-src (5.2.1-3) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Workaround https://bugreports.qt-project.org/browse/QTBUG-38061 in
     kfreebsd-* by replacing linux/types.h with sys/types.h.
+  * Rename QML packages with proper files renaming and Break+Replaces:
+    - qtdeclarative5-qtaudioengine-plugin → qml-module-qtaudioengine
+    - qtdeclarative5-qtmultimedia-plugin → qml-module-qtmultimedia
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 02 Apr 2014 15:00:22 -0300
 
diff --git a/debian/control b/debian/control
index 26efc54..b6f67a2 100644
--- a/debian/control
+++ b/debian/control
@@ -77,26 +77,52 @@ Description: Qt 5 Multimedia Widgets module
  collection of media content.
 
 Package: qtdeclarative5-qtmultimedia-plugin
+Architecture: all
+Section: oldlibs
+Depends: ${misc:Depends}, qml-module-qtmultimedia
+Description: transitional dummy package for Qt 5 Multimedia 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 for qml-module-qtmultimedia
+ which can be safely removed.
+
+Package: qml-module-qtmultimedia
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 Multimedia QML plugin
+Breaks: qtdeclarative5-qtmultimedia-plugin (<< 5.2.1-3~)
+Replaces: qtdeclarative5-qtmultimedia-plugin (<< 5.2.1-3~)
+Description: Qt 5 Multimedia 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 Multimedia QML plugin for QtDeclarative.
+ This package contains the Multimedia QML module for QtDeclarative.
 
 Package: qtdeclarative5-qtaudioengine-plugin
+Architecture: all
+Section: oldlibs
+Depends: ${misc:Depends}, qml-module-qtaudioengine
+Description: transitional dummy package for Qt 5 AudioEngine 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 for qml-module-qtaudioengine
+ which can be safely removed.
+
+Package: qml-module-qtaudioengine
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 AudioEngine QML plugin
+Breaks: qtdeclarative5-qtaudioengine-plugin (<< 5.2.1-3~)
+Replaces: qtdeclarative5-qtaudioengine-plugin (<< 5.2.1-3~)
+Description: Qt 5 AudioEngine 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 AudioEngine QML plugin for QtDeclarative.
+ This package contains the AudioEngine QML module for QtDeclarative.
 
 Package: libqgsttools-p1
 Architecture: any
@@ -115,9 +141,9 @@ Multi-Arch: same
 Section: x11
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libqt5multimedia5-plugins (= ${binary:Version}),
-         qtdeclarative5-folderlistmodel-plugin,
-         qtdeclarative5-qtmultimedia-plugin (= ${binary:Version}),
-         qtdeclarative5-qtquick2-plugin,
+         qml-module-qt-labs-folderlistmodel,
+         qml-module-qtmultimedia (= ${binary:Version}),
+         qml-module-qtquick2,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Examples for Qt 5 Multimedia module
diff --git a/debian/qtdeclarative5-qtaudioengine-plugin.install b/debian/qml-module-qtaudioengine.install
similarity index 100%
rename from debian/qtdeclarative5-qtaudioengine-plugin.install
rename to debian/qml-module-qtaudioengine.install
diff --git a/debian/qtdeclarative5-qtmultimedia-plugin.install b/debian/qml-module-qtmultimedia.install
similarity index 100%
rename from debian/qtdeclarative5-qtmultimedia-plugin.install
rename to debian/qml-module-qtmultimedia.install

-- 
qtmultimedia packaging