[SCM] qt5webkit packaging branch, master, updated. debian/5.2.1+dfsg-5-2-g84b7f16

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 84b7f161905dd7853b61cbd8c341e7aa1121cac5
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Apr 6 10:11:37 2014 -0300

    Rename libqt5webkit5-qmlwebkitplugin to qml-module-qtwebkit
---
 debian/changelog                                        |  4 ++++
 debian/control                                          | 17 +++++++++++++++--
 ...webkitplugin.install => qml-module-qtwebkit.install} |  0
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f5f6c3..72ce456 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtwebkit-opensource-src (5.2.1+dfsg-6) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Rename libqt5webkit5-qmlwebkitplugin to qml-module-qtwebkit, adding proper
+    Break and Replaces.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 06 Apr 2014 10:04:08 -0300
 
 qtwebkit-opensource-src (5.2.1+dfsg-5) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 055aa79..34a8e2a 100644
--- a/debian/control
+++ b/debian/control
@@ -70,15 +70,28 @@ Description: Web content engine library for Qt
  This package contains the QtWebKit libraries.
 
 Package: libqt5webkit5-qmlwebkitplugin
+Architecture: all
+Section: oldlibs
+Depends: ${misc:Depends}, qml-module-qtwebkit
+Description: transitional dummy package for Qt WebKit QML module
+ QtWebKit provides a Web browser engine that makes it easy to embed content
+ from the World Wide Web into your Qt application.
+ .
+ This is a transitional dummy package which can be safely removed.
+
+Package: qml-module-qtwebkit
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt WebKit QML plugin
+Breaks: libqt5webkit5-qmlwebkitplugin (<< 5.2.1+dfsg-6~)
+Replaces: libqt5webkit5-qmlwebkitplugin (<< 5.2.1+dfsg-6~)
+Description: Qt WebKit QML module
  QtWebKit provides a Web browser engine that makes it easy to embed content
  from the World Wide Web into your Qt application.
  .
- This package contains the WebKit QML plugin for QtDeclarative.
+ This package contains the WebKit QML module for QtDeclarative.
+
 
 Package: libqt5webkit5-dbg
 Priority: extra
diff --git a/debian/libqt5webkit5-qmlwebkitplugin.install b/debian/qml-module-qtwebkit.install
similarity index 100%
rename from debian/libqt5webkit5-qmlwebkitplugin.install
rename to debian/qml-module-qtwebkit.install

-- 
qt5webkit packaging