[SCM] qtconnectivity packaging branch, master, updated. debian/5.2.1-2-2-gb1f8b3f

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit b1f8b3fa0784fc135f37f8e95d34d9b07e7503ab
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Apr 2 17:01:08 2014 -0300

    Rename QML packages.
---
 debian/changelog                                   |  5 ++++
 debian/control                                     | 33 +++++++++++++++++++---
 ...ugin.install => qml-module-qtbluetooth.install} |  0
 ...nfc-plugin.install => qml-module-qtnfc.install} |  0
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50d4e67..49a20b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 qtconnectivity-opensource-src (5.2.1-3) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Rename QML packages with proper Break+Replaces and files renaming:
+    - qtdeclarative5-qtbluetooth-plugin → qml-module-qtbluetooth
+    - qtdeclarative5-qtnfc-plugin → qml-module-qtnfc
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 02 Apr 2014 16:49:40 -0300
 
 qtconnectivity-opensource-src (5.2.1-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 568683e..f6a9ff7 100644
--- a/debian/control
+++ b/debian/control
@@ -29,15 +29,27 @@ Description: Qt Connectivity Bluetooth module
  This package contains the Bluetooth part of the Qt Connectivity module.
 
 Package: qtdeclarative5-qtbluetooth-plugin
+Architecture: all
+Section: oldlibs
+Depends: ${misc:Depends}, qml-module-qtbluetooth
+Description: transitional dummy package for Qt5's Bluetooth 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-qtbluetooth
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libqt5bluetooth5, ${misc:Depends}, ${shlibs:Depends}
-Description: Qt Connectivity module - Bluetooth QML plugin
+Breaks: qtdeclarative5-qtbluetooth-plugin (<< 5.2.1-3~)
+Replaces: qtdeclarative5-qtbluetooth-plugin (<< 5.2.1-3~)
+Description: Qt Connectivity module - Bluetooth 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 Bluetooth QML plugin from the Qt Connectivity module.
+ This package contains the Bluetooth QML module from the Qt Connectivity module.
 
 Package: libqt5nfc5
 Architecture: any
@@ -51,15 +63,28 @@ Description: Qt Connectivity NFC module
  This package contains the NFC part of the Qt Connectivity module.
 
 Package: qtdeclarative5-qtnfc-plugin
+Architecture: all
+Section: oldlibs
+Depends: ${misc:Depends}, qml-module-qtnfc
+Description: transitional dummy package for Qt5's NFC 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-qtnfc and it can be
+ safely removed.
+
+Package: qml-module-qtnfc
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libqt5nfc5, ${misc:Depends}, ${shlibs:Depends}
-Description: Qt Connectivity module - NFC QML plugin
+Breaks: qtdeclarative5-qtnfc-plugin (<< 5.2.1-3~)
+Replaces: qtdeclarative5-qtnfc-plugin (<< 5.2.1-3~)
+Description: Qt Connectivity module - NFC 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 NFC QML plugin from the Qt Connectivity module.
+ This package contains the NFC QML module from the Qt Connectivity module.
 
 Package: qtconnectivity5-dev
 Section: libdevel
diff --git a/debian/qtdeclarative5-qtbluetooth-plugin.install b/debian/qml-module-qtbluetooth.install
similarity index 100%
rename from debian/qtdeclarative5-qtbluetooth-plugin.install
rename to debian/qml-module-qtbluetooth.install
diff --git a/debian/qtdeclarative5-qtnfc-plugin.install b/debian/qml-module-qtnfc.install
similarity index 100%
rename from debian/qtdeclarative5-qtnfc-plugin.install
rename to debian/qml-module-qtnfc.install

-- 
qtconnectivity packaging