[SCM] qtcreator packaging branch, master, updated. debian/2.7.0-1-27-g06f08cc

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 71a2f33f067f4235a2b97a4e7079c11674846fab
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Jul 22 16:33:34 2013 -0300

    Refresh patches.
---
 debian/patches/botan_system_lib.diff |    2 +-
 debian/patches/rpath_nonlinux.diff   |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/patches/botan_system_lib.diff b/debian/patches/botan_system_lib.diff
index 08f1f12..4c31448 100644
--- a/debian/patches/botan_system_lib.diff
+++ b/debian/patches/botan_system_lib.diff
@@ -79,7 +79,7 @@ Author: Felix Geyer <debfx at ubuntu.com>
 --- a/src/libs/ssh/sshcryptofacility_p.h
 +++ b/src/libs/ssh/sshcryptofacility_p.h
 @@ -31,9 +31,11 @@
- #define SSHABSTRACTCRYPTOFACILITY_P_H
+ #define SSHCRYPTOFACILITY_P_H
  
  #include <botan/botan.h>
 +#include <botan/hmac.h>
diff --git a/debian/patches/rpath_nonlinux.diff b/debian/patches/rpath_nonlinux.diff
index d7c4776..09c17a4 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
-@@ -91,7 +91,7 @@ macx {
+@@ -110,7 +110,7 @@ macx {
          QMAKE_LFLAGS_SONAME = -Wl,-install_name, at rpath/PlugIns/$${PROVIDER}/
          QMAKE_LFLAGS += -Wl,-rpath, at loader_path/../../,-rpath, at executable_path/../
      }
@@ -33,9 +33,9 @@ Forwarded: no
      #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
      QMAKE_RPATHDIR += \$\$ORIGIN
      QMAKE_RPATHDIR += \$\$ORIGIN/..
-@@ -107,7 +107,7 @@ CONFIG += include_source_dir
- contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
+@@ -127,7 +127,7 @@ contains(QT_CONFIG, reduce_exports):CONF
  
+ TEMPLATE = lib
  CONFIG += plugin plugin_with_soname
 -linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
 +linux*|glibc-*|hurd-*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF

-- 
qtcreator packaging