[SCM] qtcreator packaging branch, master, updated. debian/4.1.0-4-9-ga802888

[Adam Majer]

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

The following commit has been merged in the master branch:
commit 604b34bc3e7c8272db0abfeeb253b0fe03f7f2c6
Author: Adam Majer <adamm at zombino.com>
Date:   Thu Jan 5 00:16:54 2017 +0100

    Update build dependencies
    
    LLVM now only required on amd64 and dropped from other architectures
    as it is unlikely people are actually using it there. Othrwise
    we will have unnecessary build dependencies that could block
    overall Qt Creator's build.
---
 debian/changelog | 6 +++++-
 debian/control   | 5 ++---
 debian/rules     | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e18d8c9..3cce24c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,12 @@ qtcreator (4.2.0-1) UNRELEASED; urgency=medium
     + Made display of maps more compact under debugger
     + Added pretty printing of `QRegExp` captures, `QStaticStringData`,
       `QStandardItem`, and `std::pair` udner debugger
-  * Bump min Qt dependencies to 5.6.0 and QBS to 1.7.0
+  * Bump min build dependencies:
+    + Qt 5.6.0
+    + QBS 1.7.0
+    + clang/llvm 3.9.0, only build clangplugin on amd64
   * debian/watch: update downloaded files to XZ compressed
+  * debian/control: add missing build dependency on llvm
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 25 Dec 2016 16:27:08 +0100
 
diff --git a/debian/control b/debian/control
index c640059..9a96c91 100644
--- a/debian/control
+++ b/debian/control
@@ -8,15 +8,14 @@ Uploaders: Adam Majer <adamm at zombino.com>,
            Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 Build-Depends: debhelper (>= 9),
                libbotan1.10-dev,
-               libclang-dev [!armel !alpha !hppa !hurd-i386 !kfreebsd-any !m68k !powerpcspe !sh4 !sparc64 !x32],
+               libclang-3.9-dev [amd64],
+               llvm-3.9-dev [amd64],
                libicu-dev,
                libjs-jquery,
                libqt5opengl5-dev (>= 5.6.0~),
                libqt5sql5-sqlite (>= 5.6.0~),
                libqt5webkit5-dev (>= 5.6.0~),
                libqt5x11extras5-dev (>= 5.6.0~),
-#               libx11-dev,
-               libxext-dev,
                pkg-config,
                qbs-dev (>= 1.7.0~),
                qml-module-qtquick2 (>= 5.6.0~),
diff --git a/debian/rules b/debian/rules
index a6b8189..c669664 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 := $(shell if [ -d /usr/lib/llvm-3.9 ]; then echo /usr/lib/llvm-3.9; else echo /usr/lib/llvm-3.8; fi)
+export LLVM_INSTALL_DIR := $(shell if [ -d /usr/lib/llvm-3.9 ]; then echo /usr/lib/llvm-3.9; fi)
 
 # Upstream changelog
 upstream_changes := $(wildcard dist/changes-*)

-- 
qtcreator packaging