[SCM] qtcreator packaging branch, master, updated. 06f219f2156856e99a00a5dff096c7c19a3ad3f0

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 06f219f2156856e99a00a5dff096c7c19a3ad3f0
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed May 22 18:25:40 2013 -0300

    Update 02_use_x-terminal-emulator.diff.
    
    The changes seems to come from Ubuntu, but I don't know who did it.
---
 debian/changelog                               |    2 ++
 debian/patches/02_use_x-terminal-emulator.diff |   15 +++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7fdf01b..7bc8cde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ qtcreator (2.7.0-1) UNRELEASED; urgency=low
     - Use qtdeclarative5-private-dev, as described in the README.
   * Export CFLAGS, CXXFLAGS, LDFLAGS for hardening and QT_SELECT to choose qt5.
   * Change Depends and Recommends of packages qtcreator and qtcreator-doc.
+  * Update 02_use_x-terminal-emulator.diff. The changes seems to come from
+    Ubuntu, but I don't know who did it.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 22 May 2013 15:40:28 -0300
 
diff --git a/debian/patches/02_use_x-terminal-emulator.diff b/debian/patches/02_use_x-terminal-emulator.diff
index 091de74..ff92f6e 100644
--- a/debian/patches/02_use_x-terminal-emulator.diff
+++ b/debian/patches/02_use_x-terminal-emulator.diff
@@ -7,12 +7,11 @@ Author: Fathi Boudra <fabo at debian.org>
 
 --- a/src/libs/utils/consoleprocess_unix.cpp
 +++ b/src/libs/utils/consoleprocess_unix.cpp
-@@ -284,7 +284,7 @@ QString ConsoleProcess::defaultTerminalE
- #ifdef Q_OS_MAC
-     return QLatin1String("/usr/X11/bin/xterm");
- #else
--    return QLatin1String("xterm");
-+    return QLatin1String("x-terminal-emulator");
- #endif
- }
+@@ -283,6 +283,7 @@ struct Terminal {
  
+ static const Terminal knownTerminals[] =
+ {
++    {"x-terminal-emulator", "-e"},
+     {"xterm", "-e"},
+     {"aterm", "-e"},
+     {"Eterm", "-e"},

-- 
qtcreator packaging