[SCM] qtcreator packaging branch, master, updated. debian/3.5.0+dfsg-2-4-g2abdf7c

[Adam Majer]

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

The following commit has been merged in the master branch:
commit 888d09534d1a2f7a9d8ee77891caad553e7c208c
Author: Adam Majer <adamm at zombino.com>
Date:   Sat Oct 24 23:52:47 2015 -0500

    Drop clang dependency to 3.7 or 3.6
    
    Clang 3.8 is not yet released, and there are issues on some platforms
    where it is unbuildable. Drop dependency to clang 3.6/3.7, for now.
---
 debian/changelog | 3 +++
 debian/control   | 2 +-
 debian/rules     | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3039cfc..cb66680 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtcreator (3.5.0+dfsg-3) UNRELEASED; urgency=medium
 
+  [ Adam Majer ]
+  * Allow building of ClangCodeModel using either LLVM 3.7 or 3.6
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 22 Oct 2015 16:46:57 -0300
 
 qtcreator (3.5.0+dfsg-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 6696e39..52c76e1 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Adam Majer <adamm at zombino.com>,
            Jeremy Lainé <jeremy.laine at m4x.org>,
            Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 Build-Depends: debhelper (>= 9),
-               libclang-3.8-dev,
+               libclang-3.7-dev | libclang-3.6-dev,
                libbotan1.10-dev,
                libicu-dev,
                libjs-jquery,
diff --git a/debian/rules b/debian/rules
index 580c668..68b1a03 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ export QMAKE_CXXFLAGS_DEBUG := $(CXXFLAGS)
 export QMAKE_LFLAGS_RELEASE := $(LDFLAGS)
 export QMAKE_LFLAGS_DEBUG := $(LDFLAGS)
 export QT_SELECT := qt5
-export LLVM_INSTALL_DIR := /usr/lib/llvm-3.8
+export LLVM_INSTALL_DIR := $(shell if [ -d /usr/lib/llvm-3.7 ]; then echo /usr/lib/llvm-3.7; else echo /usr/lib/llvm-3.6; fi)
 
 # Upstream changelog
 upstream_changes := $(wildcard dist/changes-*)

-- 
qtcreator packaging