[SCM] qtcreator packaging branch, master, updated. debian/3.6.0-2-4-g1382861

[Adam Majer]

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

The following commit has been merged in the master branch:
commit 3b1dc7cd6655cdb5abd351cab3f323fae138ee9d
Author: Adam Majer <adamm at zombino.com>
Date:   Wed Mar 23 21:34:25 2016 -0500

    Remove upstreamed patch
---
 debian/changelog                       |  2 ++
 debian/patches/disable_llvm_rpath.diff | 13 -------------
 debian/patches/series                  |  1 -
 debian/rules                           |  2 +-
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 18933a4..05fd4e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 qtcreator (3.6.1-1) UNRELEASED; urgency=medium
 
   * New upstream version
+  * debian/patches:
+      + remove disable_llvm_rpath.diff - upstreamed
 
  -- Adam Majer <adamm at zombino.com>  Wed, 27 Jan 2016 14:30:20 -0600
 
diff --git a/debian/patches/disable_llvm_rpath.diff b/debian/patches/disable_llvm_rpath.diff
deleted file mode 100644
index acdce60..0000000
--- a/debian/patches/disable_llvm_rpath.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qtcreator/src/tools/clangbackend/clangbackend.pro
-===================================================================
---- qtcreator.orig/src/tools/clangbackend/clangbackend.pro	2015-08-18 05:02:51.000000000 -0500
-+++ qtcreator/src/tools/clangbackend/clangbackend.pro	2015-09-27 14:57:41.536547126 -0500
-@@ -16,5 +16,7 @@
- 
- unix {
-     !osx: QMAKE_LFLAGS += -Wl,-z,origin
--    QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR})
-+    !llvm_disable_rpath {
-+        QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR})
-+    }
- }
diff --git a/debian/patches/series b/debian/patches/series
index db8057a..efff239 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-disable_llvm_rpath.diff
 02_use_x-terminal-emulator.diff
 rpath_nonlinux.diff
 
diff --git a/debian/rules b/debian/rules
index d5c9eee..39c9b8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ override_dh_auto_configure:
 		QBS_INSTALL_DIR=/usr \
 		PREFIX=/usr/ \
 		LLVM_INSTALL_DIR="$(LLVM_INSTALL_DIR)" \
-		CONFIG+=llvm_disable_rpath \
+		CONFIG+=disable_external_rpath \
 		$(CURDIR) IDE_LIBRARY_BASENAME=lib/$(DEB_HOST_MULTIARCH) IDE_PACKAGE_MODE=1 USE_SYSTEM_BOTAN=1 $(extra_configure_opts)
 
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), armhf))

-- 
qtcreator packaging