[SCM] qtwebsockets packaging branch, experimental, updated. debian/5.3.2-1-2-g0997727

[Timo Jyrinki]

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

The following commit has been merged in the experimental branch:
commit 0997727519e8f9b5b3ec984ba79a4755805c2bd8
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri Sep 19 05:51:30 2014 +0000

    Add Qt Declarative build dependency and build the QML module
    
    Conflicts:
    	debian/changelog
    	debian/control
---
 debian/changelog                        |  3 ++-
 debian/control                          | 14 +++++++++++++-
 debian/qml-module-qt-websockets.install |  1 +
 debian/qtwebsockets5-examples.install   |  4 ++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 85c71b3..b4e1b16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qtwebsockets-opensource-src (5.3.2-2) UNRELEASED; urgency=medium
 
- *  
+  [ Timo Jyrinki ]
+  * Add Qt Declarative build dependency and build the QML module
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 19 Sep 2014 12:29:15 +0000
 
diff --git a/debian/control b/debian/control
index 700f61a..383df79 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Uploaders: Fathi Boudra <fabo at debian.org>,
 Build-Depends: debhelper (>= 9.0.0),
                pkg-kde-tools,
                qtbase5-private-dev (>= 5.3.2+dfsg~)
+               qtdeclarative5-dev (>= 5.3.2~)
 Build-Depends-Indep: libqt5sql5-sqlite (>= 5.3.2+dfsg~),
                      qtbase5-doc-html (>= 5.3.2~),
                      qttools5-dev-tools (>= 5.3.2~)
@@ -44,12 +45,23 @@ 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
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libqt5websockets5, ${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: qtwebsockets5-examples
 Architecture: any
 Multi-Arch: same
 Section: doc
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: qml-module-qtquick2, qml-module-qt-websockets, ${misc:Depends}, ${shlibs:Depends}
 Description: Examples for Qt 5 Web Sockets 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/qml-module-qt-websockets.install b/debian/qml-module-qt-websockets.install
new file mode 100644
index 0000000..99a09e1
--- /dev/null
+++ b/debian/qml-module-qt-websockets.install
@@ -0,0 +1 @@
+usr/lib/*/qt5/qml/Qt/WebSockets/*
diff --git a/debian/qtwebsockets5-examples.install b/debian/qtwebsockets5-examples.install
index d9592ad..ac4b467 100644
--- a/debian/qtwebsockets5-examples.install
+++ b/debian/qtwebsockets5-examples.install
@@ -6,6 +6,10 @@ usr/lib/*/qt5/examples/websockets/echoserver/echoserver.cpp
 usr/lib/*/qt5/examples/websockets/echoserver/echoserver.h
 usr/lib/*/qt5/examples/websockets/echoserver/echoserver.pro
 usr/lib/*/qt5/examples/websockets/echoserver/main.cpp
+usr/lib/*/qt5/examples/websockets/qmlwebsocketclient/data.qrc
+usr/lib/*/qt5/examples/websockets/qmlwebsocketclient/main.cpp
+usr/lib/*/qt5/examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml
+usr/lib/*/qt5/examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro
 usr/lib/*/qt5/examples/websockets/simplechat/chatserver.cpp
 usr/lib/*/qt5/examples/websockets/simplechat/chatserver.h
 usr/lib/*/qt5/examples/websockets/simplechat/main.cpp

-- 
qtwebsockets packaging