[SCM] qtcreator packaging branch, master, updated. debian/3.6.1-1-5-ge25faa6

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 917e8ab8a2cc4311dff47a03bfeb57f0e0235017
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed May 11 15:18:09 2016 -0300

    Remove 02_use_x-terminal-emulator.diff, already present upstream.
---
 debian/changelog                               |  1 +
 debian/patches/02_use_x-terminal-emulator.diff | 17 -----------------
 debian/patches/series                          |  1 -
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ee16f61..a7077c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtcreator (4.0.0-1) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
   * Instruct uscan to repack the original source with xz compression.
+  * Remove 02_use_x-terminal-emulator.diff, already present upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 11 May 2016 14:59:38 -0300
 
diff --git a/debian/patches/02_use_x-terminal-emulator.diff b/debian/patches/02_use_x-terminal-emulator.diff
deleted file mode 100644
index 6676a3f..0000000
--- a/debian/patches/02_use_x-terminal-emulator.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: use x-terminal-emulator on Debian based distributions
-Author: Fathi Boudra <fabo at debian.org>
-
----
- src/libs/utils/consoleprocess_unix.cpp |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/src/libs/utils/consoleprocess_unix.cpp
-+++ b/src/libs/utils/consoleprocess_unix.cpp
-@@ -349,6 +349,7 @@ struct Terminal {
- 
- static const Terminal knownTerminals[] =
- {
-+    {"x-terminal-emulator", "-e"},
-     {"xterm", "-e"},
-     {"aterm", "-e"},
-     {"Eterm", "-e"},
diff --git a/debian/patches/series b/debian/patches/series
index efff239..2786010 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-02_use_x-terminal-emulator.diff
 rpath_nonlinux.diff
 
 # Debian patches.

-- 
qtcreator packaging