[Pkg-telepathy-commits] [telepathy-rakia] 01/02: Switch from cdbs to dh 9

[Simon McVittie]

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

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

commit e3a3c4fb9c730d24b6f3782acfc5b4e1e69ae948
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Sep 16 15:07:10 2014 +0100

    Switch from cdbs to dh 9
---
 debian/changelog |  1 +
 debian/compat    |  2 +-
 debian/control   |  3 +--
 debian/rules     | 25 +++++++++++++++++--------
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1b81eef..f99eadd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 telepathy-rakia (0.8.0-3) UNRELEASED; urgency=medium
 
   * debian/watch: only watch for 0.x stable branches
+  * Switch from cdbs to dh 9
 
  -- Simon McVittie <smcv at debian.org>  Tue, 16 Sep 2014 14:46:44 +0100
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 394f4a6..0a6e31e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,7 @@ Uploaders: Dafydd Harries <daf at debian.org>,
            Laurent Bigonville <bigon at debian.org>,
            Loic Minier <lool at dooz.org>,
            Jonny Lamb <jonny at debian.org>
-Build-Depends: cdbs,
-               debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                libglib2.0-dev (>= 2.30),
                libdbus-1-dev (>= 0.60),
diff --git a/debian/rules b/debian/rules
index 78d077d..99cb3d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,22 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
+include /usr/share/dpkg/default.mk
 
-# List any files which are not installed
-include /usr/share/cdbs/1/rules/utils.mk
-common-binary-post-install-arch:: list-missing
+%:
+	dh $@ --parallel --with autoreconf
 
-DEB_CONFIGURE_LIBEXECDIR := "\$${prefix}/lib/telepathy"
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--disable-silent-rules \
+		--libdir="\$${prefix}/lib" \
+		--libexecdir="\$${libdir}/telepathy" \
+		--disable-static \
+                $(NULL)
 
-include $(CURDIR)/debian/update-patches.mk
+override_dh_install:
+	dh_install --list-missing
+
+# The regression tests are too prone to race conditions for the buildds,
+# and don't work when autoreconf'd with Automake 1.13.
+override_dh_auto_test:
+	:

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