[SCM] qtcreator packaging branch, master, updated. debian/3.5.0+dfsg-1-8-ged535c3

[Adam Majer]

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

The following commit has been merged in the master branch:
commit 71066453199caa45a1f3640b124440a9186c0c63
Author: Adam Majer <adamm at zombino.com>
Date:   Sun Sep 27 13:55:28 2015 -0500

    Enable ClangCodeModel plugin
---
 debian/changelog | 1 +
 debian/control   | 1 +
 debian/rules     | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8116681..651fbab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtcreator (3.5.0+dfsg-2) UNRELEASED; urgency=medium
 
   [ Adam Majer ]
   * Remove QtQuick1 build dependencies.
+  * Enable ClangCodeModel plugin (closes: #791348)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 25 Aug 2015 22:26:25 -0500
 
diff --git a/debian/control b/debian/control
index fdd2123..6696e39 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +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,
                libbotan1.10-dev,
                libicu-dev,
                libjs-jquery,
diff --git a/debian/rules b/debian/rules
index c809ca1..21fa344 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +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
 
 # Upstream changelog
 upstream_changes := $(wildcard dist/changes-*)
@@ -40,6 +41,7 @@ override_dh_auto_configure:
 		QMAKE_STRIP=: \
 		QBS_INSTALL_DIR=/usr \
 		PREFIX=/usr/ \
+		LLVM_INSTALL_DIR="$(LLVM_INSTALL_DIR)" \
 		$(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