[SCM] qtcreator packaging branch, master, updated. debian/2.8.1-3-5-g30b6882

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 257c0bcc2da03a95f2f3c1149472155293b8c2d5
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Feb 20 22:35:52 2014 -0300

    Refresh rpath_nonlinux.diff.
---
 debian/changelog                   | 1 +
 debian/patches/rpath_nonlinux.diff | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c9f4820..3b6a371 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtcreator (3.0.1-1) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
   * Fix watch file.
+  * Refresh rpath_nonlinux.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 20 Feb 2014 22:24:57 -0300
 
diff --git a/debian/patches/rpath_nonlinux.diff b/debian/patches/rpath_nonlinux.diff
index 09c17a4..c3af564 100644
--- a/debian/patches/rpath_nonlinux.diff
+++ b/debian/patches/rpath_nonlinux.diff
@@ -24,7 +24,7 @@ Forwarded: no
      QMAKE_RPATHDIR += \$\$ORIGIN
 --- a/src/qtcreatorplugin.pri
 +++ b/src/qtcreatorplugin.pri
-@@ -110,7 +110,7 @@ macx {
+@@ -136,7 +136,7 @@ macx {
          QMAKE_LFLAGS_SONAME = -Wl,-install_name, at rpath/PlugIns/$${PROVIDER}/
          QMAKE_LFLAGS += -Wl,-rpath, at loader_path/../../,-rpath, at executable_path/../
      }
@@ -33,7 +33,7 @@ Forwarded: no
      #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
      QMAKE_RPATHDIR += \$\$ORIGIN
      QMAKE_RPATHDIR += \$\$ORIGIN/..
-@@ -127,7 +127,7 @@ contains(QT_CONFIG, reduce_exports):CONF
+@@ -150,7 +150,7 @@ contains(QT_CONFIG, reduce_exports):CONF
  
  TEMPLATE = lib
  CONFIG += plugin plugin_with_soname

-- 
qtcreator packaging