[SCM] qtcreator packaging branch, master, updated. debian/3.5.1+dfsg-2-10-g6abe3b7

[Adam Majer]

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

The following commit has been merged in the master branch:
commit 4188808d3564d606fa48dde13a2e587e483a00a5
Author: Adam Majer <adamm at zombino.com>
Date:   Tue Jan 19 00:38:31 2016 -0600

    Refreshed reverted patch to disable rpaths in clangbackend
---
 debian/changelog                       |  3 +++
 debian/patches/disable_llvm_rpath.diff | 15 ---------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 45450f8..70ab6a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ qtcreator (3.6.0-1) UNRELEASED; urgency=medium
     - Adjust README.source and debian/watch to this new situation.
   * Refresh patches.
 
+  [ Adam Majer ]
+  * Refreshed disable_llvm_rpath.diff - still needed for clangbackend binary.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 29 Dec 2015 14:10:05 -0300
 
 qtcreator (3.5.1+dfsg-2) unstable; urgency=medium
diff --git a/debian/patches/disable_llvm_rpath.diff b/debian/patches/disable_llvm_rpath.diff
index 525ff07..acdce60 100644
--- a/debian/patches/disable_llvm_rpath.diff
+++ b/debian/patches/disable_llvm_rpath.diff
@@ -1,18 +1,3 @@
-Index: qtcreator/src/plugins/clangcodemodel/clangcodemodel.pro
-===================================================================
---- qtcreator.orig/src/plugins/clangcodemodel/clangcodemodel.pro	2015-09-27 14:54:16.570761417 -0500
-+++ qtcreator/src/plugins/clangcodemodel/clangcodemodel.pro	2015-09-27 14:55:51.205735495 -0500
-@@ -9,7 +9,9 @@
- DEFINES += CLANG_VERSION=\\"$${LLVM_VERSION}\\"
- DEFINES += "\"CLANG_RESOURCE_DIR=\\"$${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include\\"\""
- 
--unix:QMAKE_LFLAGS += -Wl,-rpath,\'$$LLVM_LIBDIR\'
-+!llvm_disable_rpath {
-+    unix:QMAKE_LFLAGS += -Wl,-rpath,\'$$LLVM_LIBDIR\'
-+}
- 
- SOURCES += \
-     activationsequencecontextprocessor.cpp \
 Index: qtcreator/src/tools/clangbackend/clangbackend.pro
 ===================================================================
 --- qtcreator.orig/src/tools/clangbackend/clangbackend.pro	2015-08-18 05:02:51.000000000 -0500

-- 
qtcreator packaging