[SCM] qtcreator packaging branch, master, updated. debian/3.0.1+dfsg+exp-3-8-g133e208

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 133e20896d955de1dc4a9bcc034661ed7275c237
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Apr 3 12:47:36 2014 -0300

    Disable parallel builds on arm*.
---
 debian/changelog | 3 +++
 debian/rules     | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f109344..c336404 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qtcreator (3.0.1+dfsg+exp-4) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Add qml-module-qtquick-controls and qml-module-qtquick2 as
     dependencies (Closes: #742710).
+  * Disable parallel builds on arm*. It seems make is currently having problems
+    with parallel builds on arm, so we disable them. It might get fixed with
+    make 4.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 27 Mar 2014 18:31:56 -0300
 
diff --git a/debian/rules b/debian/rules
index a0a319c..2f5cbac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,8 +19,16 @@ export QT_SELECT := qt5
 # Upstream changelog
 upstream_changes := $(wildcard dist/changes-*)
 
+# Disable parallel builds on arm*, as make seems to be having problems
+# on arm.
+no_parallel_build := armel armhf arm64
+
 %:
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(no_parallel_build)))
+	dh $@ --dbg-package=qtcreator-dbg --builddirectory=builddir
+else
 	dh $@ --parallel --dbg-package=qtcreator-dbg --builddirectory=builddir
+endif
 
 override_dh_auto_configure:
 	# Create some symlinks to jquery stuff.

-- 
qtcreator packaging