[SCM] qtcreator packaging branch, master, updated. debian/3.1.2+dfsg-2-5-ge713c46

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 7e28db765a8a8e16803ced87d53487cc337caee0
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Aug 19 15:28:05 2014 -0300

    Reresh patches.
---
 debian/changelog                               |  1 +
 debian/patches/02_use_x-terminal-emulator.diff |  2 +-
 debian/patches/rpath_nonlinux.diff             | 10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6496896..e6564bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtcreator (3.2.0+dfsg-1) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
+  * Refresh patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 19 Aug 2014 15:18:07 -0300
 
diff --git a/debian/patches/02_use_x-terminal-emulator.diff b/debian/patches/02_use_x-terminal-emulator.diff
index 57c3766..1c1c647 100644
--- a/debian/patches/02_use_x-terminal-emulator.diff
+++ b/debian/patches/02_use_x-terminal-emulator.diff
@@ -7,7 +7,7 @@ Author: Fathi Boudra <fabo at debian.org>
 
 --- a/src/libs/utils/consoleprocess_unix.cpp
 +++ b/src/libs/utils/consoleprocess_unix.cpp
-@@ -345,6 +345,7 @@ struct Terminal {
+@@ -351,6 +351,7 @@ struct Terminal {
  
  static const Terminal knownTerminals[] =
  {
diff --git a/debian/patches/rpath_nonlinux.diff b/debian/patches/rpath_nonlinux.diff
index 267edf8..e0e51f3 100644
--- a/debian/patches/rpath_nonlinux.diff
+++ b/debian/patches/rpath_nonlinux.diff
@@ -24,16 +24,16 @@ Forwarded: no
      QMAKE_RPATHDIR += \$\$ORIGIN
 --- a/src/qtcreatorplugin.pri
 +++ b/src/qtcreatorplugin.pri
-@@ -132,7 +132,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
+@@ -126,7 +126,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
  macx {
-     QMAKE_LFLAGS_SONAME = -Wl,-install_name, at rpath/PlugIns/$${PROVIDER}/
-     QMAKE_LFLAGS += -Wl,-rpath, at loader_path/../../,-rpath, at executable_path/../
+     QMAKE_LFLAGS_SONAME = -Wl,-install_name, at rpath/PlugIns/
+     QMAKE_LFLAGS += -Wl,-rpath, at loader_path/../,-rpath, at executable_path/../
 -} else:linux-* {
 +} else:linux-*|glibc-*|hurd-* {
      #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
      QMAKE_RPATHDIR += \$\$ORIGIN
      QMAKE_RPATHDIR += \$\$ORIGIN/..
-@@ -146,7 +146,7 @@ contains(QT_CONFIG, reduce_exports):CONF
+@@ -139,7 +139,7 @@ contains(QT_CONFIG, reduce_exports):CONF
  
  TEMPLATE = lib
  CONFIG += plugin plugin_with_soname
@@ -41,7 +41,7 @@ Forwarded: no
 +linux*|glibc-*|hurd-*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
  
  !macx {
-     target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
+     target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins
 --- a/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
 +++ b/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
 @@ -13,7 +13,7 @@ isEmpty(IDE_LIBRARY_BASENAME) {

-- 
qtcreator packaging