[Pkg-telepathy-commits] [telepathy-salut] 01/01: Work around automake bug #704225 to fix FTBFS on armel, armhf, sparc

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-salut.

commit cd6226f0ee6842142fce5a13603c405ce68e7eaa
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jul 31 09:32:00 2014 +0100

    Work around automake bug #704225 to fix FTBFS on armel, armhf, sparc
---
 debian/changelog | 6 ++++++
 debian/rules     | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c1ffc5e..52486f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+telepathy-salut (0.8.1-4) unstable; urgency=medium
+
+  * Work around automake bug #704225 to fix FTBFS on armel, armhf, sparc
+
+ -- Simon McVittie <smcv at debian.org>  Thu, 31 Jul 2014 09:31:13 +0100
+
 telepathy-salut (0.8.1-3) unstable; urgency=medium
 
   * Also run autoreconf in lib/ext/wocky, as was done in Ubuntu
diff --git a/debian/rules b/debian/rules
index 80b4a24..6869fca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,13 @@
 include /usr/share/dpkg/default.mk
 
 %:
-	dh $@ --with autoreconf --parallel
+	dh $@ --with autoreconf
+
+# Work around #704225: Automake can do parallel make, but not parallel
+# "make install" if libtool relinking is required; so only use --parallel
+# for the build, not the rest.
+override_dh_auto_build:
+	dh_auto_build --parallel
 
 # Now that we use debhelper 9, dh_auto_configure defaults to
 # $libexecdir=$libdir, which might be better than this, but doesn't match

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-salut.git