[SCM] qtwebsockets packaging branch, experimental, updated. debian/5.4.2-2-9-gb790de1

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 231ec997c4a70ef024a92cc2e16679cac413e6ad
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Aug 27 15:32:27 2015 +0300

    Adjust for upstream renaming of QtWebSockets module.
    
    Upstream has renamed Qt.WebSockets QML module to QtWebSockets.
    (Qt.WebSockets still exists as a compatibility layer).
    
     - Add new qml-module-qtwebsockets binary package.
     - Move qml-module-qt-websockets to oldlibs section.
     - Make qml-module-qt-websockets depend on qml-module-qtwebsockets.
---
 debian/changelog                       |  5 +++++
 debian/control                         | 18 ++++++++++++++++--
 debian/qml-module-qtwebsockets.install |  1 +
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 39c010d..19f38f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,11 @@ qtwebsockets-opensource-src (5.5.0-1) UNRELEASED; urgency=medium
   * Do not run tests during arch-indep build.
   * Do not run QML tests, to avoid dependency on Xvfb
     (disable_qml_tests.patch; patch taken from Ubuntu).
+  * Upstream has renamed Qt.WebSockets QML module to QtWebSockets
+    (Qt.WebSockets still exists as a compatibility layer).
+    - Add new qml-module-qtwebsockets binary package.
+    - Move qml-module-qt-websockets to oldlibs section.
+    - Make qml-module-qt-websockets depend on qml-module-qtwebsockets.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 27 Aug 2015 14:28:20 +0300
 
diff --git a/debian/control b/debian/control
index 8e407c5..1674f49 100644
--- a/debian/control
+++ b/debian/control
@@ -43,17 +43,31 @@ Description: Qt 5 Web Sockets module - development files
  This package contains the development files needed to build Qt applications
  using Qt 5 Web Sockets library.
 
-Package: qml-module-qt-websockets
+Package: qml-module-qtwebsockets
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libqt5websockets5, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 Web Sockets 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 Qt Web Sockets QML module.
 
+Package: qml-module-qt-websockets
+Architecture: any
+Multi-Arch: same
+Section: oldlibs
+Pre-Depends: ${misc:Pre-Depends}
+Depends: qml-module-qtwebsockets, ${misc:Depends}, ${shlibs:Depends}
+Description: Qt 5 Web Sockets compatibility 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 compatibility Qt.WebSockets QML module. Do
+ not use it, use QtWebSockets module instead (in qml-module-qtwebsockets
+ package).
+
 Package: qtwebsockets5-examples
 Architecture: any
 Multi-Arch: same
diff --git a/debian/qml-module-qtwebsockets.install b/debian/qml-module-qtwebsockets.install
new file mode 100644
index 0000000..f6990bd
--- /dev/null
+++ b/debian/qml-module-qtwebsockets.install
@@ -0,0 +1 @@
+usr/lib/*/qt5/qml/QtWebSockets/*

-- 
qtwebsockets packaging