[SCM] qtwebchannel packaging branch, master, updated. debian/5.6.1-1-3-g871c5e0

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 871c5e031819b1e3aff6948b6d1a5dd50de48767
Author: Pino Toscano <pino at debian.org>
Date:   Sun Sep 18 16:22:52 2016 +0200

    Revert "Merge branch 'Neon/release' of git://anongit.neon.kde.org/qt/qtwebchannel"
    
    No Neon stuff please.
    
    This reverts commit 3140d71c024d7a96236ba999ab8ecdc655fa515b, reversing
    changes made to f5b11cec84c4d76543b2a8e76af91a29c6c672b2.
---
 debian/changelog                 | 6 ------
 debian/patches/nodetonodejs.diff | 8 ++++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0653869..12f3904 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-qtwebchannel-opensource-src (5.7.0-0~neon1) UNRELEASED; urgency=medium
-
-  * New upstream release
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Aug 2016 16:13:40 +0100
-
 qtwebchannel-opensource-src (5.6.1-1) unstable; urgency=medium
 
   * Initial package (Closes: #832421)
diff --git a/debian/patches/nodetonodejs.diff b/debian/patches/nodetonodejs.diff
index 128bf55..90db305 100644
--- a/debian/patches/nodetonodejs.diff
+++ b/debian/patches/nodetonodejs.diff
@@ -6,13 +6,13 @@ Author: Simon Quigley <tsimonq2 at ubuntu.com>
 Last-Update: 2016-07-27
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: qtwebchannel-opensource-src-5.7.0/examples/webchannel/qwclient/qwclient.js
+Index: qtwebchannel/examples/webchannel/qwclient/qwclient.js
 ===================================================================
---- qtwebchannel-opensource-src-5.7.0.orig/examples/webchannel/qwclient/qwclient.js
-+++ qtwebchannel-opensource-src-5.7.0/examples/webchannel/qwclient/qwclient.js
+--- qtwebchannel.orig/examples/webchannel/qwclient/qwclient.js	2016-07-27 20:09:40.161572533 -0500
++++ qtwebchannel/examples/webchannel/qwclient/qwclient.js	2016-07-27 20:09:40.159572493 -0500
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env node
 +#!/usr/bin/env nodejs
  /****************************************************************************
  **
- ** Copyright (C) 2016 basysKom GmbH, author Sumedha Widyadharma <sumedha.widyadharma at basyskom.com>
+ ** Copyright (C) 2014 basysKom GmbH, author Sumedha Widyadharma <sumedha.widyadharma at basyskom.com>

-- 
qtwebchannel packaging