[Pkg-telepathy-commits] [SCM] telepathy-gabble packaging branch, debian-experimental, updated. debian/0.9.15-1-14-g136f126

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit a61ea6af61160c5e07f163f21a02863c45da19c5
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Sep 2 11:16:40 2010 +0100

    Switch rules from cdbs to dh

diff --git a/debian/changelog b/debian/changelog
index 743ba09..40dfeb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ telepathy-gabble (0.9.17-1) UNRELEASED; urgency=low
 
   * New upstream releases 0.9.16, 0.9.17
   * Standards-Version: 3.9.1 (no changes needed)
+  * Switch to debhelper 8 and 3.0 (quilt) source format
 
  -- Simon McVittie <smcv at debian.org>  Thu, 02 Sep 2010 10:37:17 +0100
 
diff --git a/debian/control b/debian/control
index c49b27f..735ba5d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,7 @@ Uploaders: Dafydd Harries <daf at debian.org>,
            Simon McVittie <smcv at debian.org>,
            Sjoerd Simons <sjoerd at debian.org>,
            Jonny Lamb <jonny at debian.org>
-Build-Depends: cdbs,
-               debhelper (>= 8),
+Build-Depends: debhelper (>= 8),
                gnutls-bin,
                libdbus-1-dev (>= 1.1.0),
                libdbus-glib-1-dev (>= 0.82),
diff --git a/debian/rules b/debian/rules
index 19d0fbd..eb80068 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,25 @@
 #!/usr/bin/make -f
-DEB_AUTO_CLEANUP_RCS            := yes
 
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
+%:
+	dh $@ --with autotools_dev
 
-# List any files which are not installed, except for the useless .la files
-common-binary-post-install-arch:: list-missing
-list-missing: prune-unwanted
-prune-unwanted:
-	rm -f debian/tmp/usr/lib/telepathy/gabble-0/*.la
+# dh_auto_configure defaults to one libexecdir per source package, which is
+# overkill for Telepathy.
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libexecdir="\$${prefix}/lib/telepathy"
+
+# parallel make works
+override_dh_auto_build:
+	dh_auto_build --parallel
 
-# cdbs defaults to one subdirectory per source package, which is overkill for us
-DEB_CONFIGURE_LIBEXECDIR := "\$${prefix}/lib/telepathy"
+# the regression tests are too race-prone to run on Debian buildds
+override_dh_auto_test:
+	:
+
+override_dh_auto_install:
+	dh_auto_install
+	rm -f debian/tmp/usr/lib/telepathy/gabble-0/*.la
 
-include $(CURDIR)/debian/update-patches.mk
+override_dh_strip:
+	dh_strip --dbg-package=telepathy-gabble-dbg

-- 
telepathy-gabble packaging