[Pkg-telepathy-commits] [SCM] telepathy-gabble packaging branch, debian-experimental, updated. debian/0.15.3-1-20-g6b18c29

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit 3f8a81d52d0eb226bf77a6e1e43318620726c228
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Apr 4 17:59:40 2012 +0100

    Simplify how we get parallel builds

diff --git a/debian/changelog b/debian/changelog
index ef92a96..ab3bdb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ telepathy-gabble (0.16.0-1) UNRELEASED; urgency=low
   * List all uninstalled files
   * Don't waste time building static libraries - the only use of libraries
     in this package is for plugins, which have to be dynamic
+  * Simplify how we get parallel builds
 
  -- Simon McVittie <smcv at debian.org>  Wed, 04 Apr 2012 16:52:35 +0100
 
diff --git a/debian/rules b/debian/rules
index 6324bfe..7e9c093 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with autotools_dev
+	dh $@ --with autotools_dev --parallel
 
 # Now that we use debhelper 9, dh_auto_configure defaults to
 # $libexecdir=$libdir, which might be better than this, but doesn't match
@@ -15,10 +15,6 @@ override_dh_auto_configure:
 		--disable-static \
 		$(NULL)
 
-# parallel make works
-override_dh_auto_build:
-	dh_auto_build --parallel
-
 # the regression tests are too race-prone to run on Debian buildds
 override_dh_auto_test:
 	:

-- 
telepathy-gabble packaging