[SCM] qtwebchannel packaging branch, experimental, updated. debian/5.9.1-2-7-g1889dd4

Dmitry Shachnev mitya57 at moszumanska.debian.org
Sun Oct 15 18:38:41 UTC 2017


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

The following commit has been merged in the experimental branch:
commit c72088a521d9b40b936a93fca90252ebae9d0adf
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Oct 15 21:24:50 2017 +0300

    Drop nodetonodejs.diff, no longer needed (see #862051).
---
 debian/changelog                 |  1 +
 debian/control                   |  2 +-
 debian/patches/nodetonodejs.diff | 16 ----------------
 debian/patches/series            |  1 -
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 241e6e4..920fd1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtwebchannel-opensource-src (5.9.2-1) UNRELEASED; urgency=medium
   * Bump Qt build-dependencies to 5.9.2.
   * Use dh_missing instead of deprecated dh_install --fail-missing.
   * Bump Standards-Version to 4.1.1, no changes needed.
+  * Drop nodetonodejs.diff, no longer needed (see #862051).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 15 Oct 2017 21:03:26 +0300
 
diff --git a/debian/control b/debian/control
index 2e1952b..4051d9f 100644
--- a/debian/control
+++ b/debian/control
@@ -68,7 +68,7 @@ Package: qtwebchannel5-examples
 Architecture: any
 Multi-Arch: same
 Depends: libqt5webchannel5 (= ${binary:Version}),
-         nodejs [!armel !powerpc],
+         nodejs (>= 6.11.2~dfsg-1~) [!armel !powerpc],
          ${misc:Depends},
          ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
diff --git a/debian/patches/nodetonodejs.diff b/debian/patches/nodetonodejs.diff
deleted file mode 100644
index 7b5213a..0000000
--- a/debian/patches/nodetonodejs.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Change shebang from node to nodejs
- In Debian, the shebang line has to be nodejs, not node, due to the fact that
- we have a node package that's different from the nodejs package, that's
- tracked in Debian bug #614907
-Author: Simon Quigley <tsimonq2 at ubuntu.com>
-Last-Update: 2016-07-27
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/examples/webchannel/qwclient/qwclient.js
-+++ b/examples/webchannel/qwclient/qwclient.js
-@@ -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>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a3d4513..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-nodetonodejs.diff

-- 
qtwebchannel packaging



More information about the pkg-kde-commits mailing list