[SCM] qtcreator packaging branch, master, updated. 45fea4d93206889bf2df3de97cdf9170591223fa

[Lisandro Damián Nicanor Pérez]

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

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

    Refresh patch.
---
 debian/patches/rpath_nonlinux.diff |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/rpath_nonlinux.diff b/debian/patches/rpath_nonlinux.diff
index 3271f1f..d7c4776 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
-@@ -64,7 +64,7 @@ macx {
+@@ -91,7 +91,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/..
-@@ -78,7 +78,7 @@ macx {
+@@ -107,7 +107,7 @@ CONFIG += include_source_dir
  contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
  
  CONFIG += plugin plugin_with_soname
@@ -41,7 +41,7 @@ Forwarded: no
 +linux*|glibc-*|hurd-*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
  
  !macx {
-     target.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
+     target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
 --- a/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
 +++ b/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
 @@ -13,7 +13,7 @@ isEmpty(IDE_LIBRARY_BASENAME) {

-- 
qtcreator packaging