[SCM] qtwebsockets packaging branch, experimental, updated. debian/5.4.1-1-8-gdbe1381

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit ee4d4274c5923199252587e6b65c338ba95c2552
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Jun 3 17:52:13 2015 -0300

    Remove fix_qwebsocket_test.diff, applied upstream.
---
 debian/changelog                        |  1 +
 debian/patches/fix_qwebsocket_test.diff | 42 ---------------------------------
 debian/patches/series                   |  1 -
 3 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ac350b..2ab3742 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtwebsockets-opensource-src (5.4.2-1) UNRELEASED; urgency=medium
     repo in more than a year. They can re add themselves whenever they want
     (and we really hope to see you back really soon!).
   * Export HTML documentation.
+  * Remove fix_qwebsocket_test.diff, applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 26 Mar 2015 09:21:24 -0300
 
diff --git a/debian/patches/fix_qwebsocket_test.diff b/debian/patches/fix_qwebsocket_test.diff
deleted file mode 100644
index 58ebecf..0000000
--- a/debian/patches/fix_qwebsocket_test.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: fix failing qwebsocket test on some architectures
-Author: Helge Deller <deller at gmx.de>
-Forwarded: not-yet
-Last-Update: 2015-01-25
-
---- a/tests/auto/qwebsocket/tst_qwebsocket.cpp
-+++ b/tests/auto/qwebsocket/tst_qwebsocket.cpp
-@@ -50,9 +50,6 @@
-     QHostAddress hostAddress() const { return m_pWebSocketServer->serverAddress(); }
-     quint16 port() const { return m_pWebSocketServer->serverPort(); }
- 
--Q_SIGNALS:
--    void closed();
--
- private Q_SLOTS:
-     void onNewConnection();
-     void processTextMessage(QString message);
-@@ -71,9 +68,8 @@
-     m_clients()
- {
-     if (m_pWebSocketServer->listen()) {
--        connect(m_pWebSocketServer, &QWebSocketServer::newConnection,
--                this, &EchoServer::onNewConnection);
--        connect(m_pWebSocketServer, &QWebSocketServer::closed, this, &EchoServer::closed);
-+        connect(m_pWebSocketServer, SIGNAL(newConnection()),
-+                this, SLOT(onNewConnection()));
-     }
- }
- 
-@@ -87,9 +83,9 @@
- {
-     QWebSocket *pSocket = m_pWebSocketServer->nextPendingConnection();
- 
--    connect(pSocket, &QWebSocket::textMessageReceived, this, &EchoServer::processTextMessage);
--    connect(pSocket, &QWebSocket::binaryMessageReceived, this, &EchoServer::processBinaryMessage);
--    connect(pSocket, &QWebSocket::disconnected, this, &EchoServer::socketDisconnected);
-+    connect(pSocket, SIGNAL(textMessageReceived(QString)), this, SLOT(processTextMessage(QString)));
-+    connect(pSocket, SIGNAL(binaryMessageReceived(QByteArray)), this, SLOT(processBinaryMessage(QByteArray)));
-+    connect(pSocket, SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
- 
-     m_clients << pSocket;
- }
diff --git a/debian/patches/series b/debian/patches/series
index 90b55ad..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-fix_qwebsocket_test.diff

-- 
qtwebsockets packaging