[Pkg-telepathy-commits] [SCM] Idle packaging branch, debian, updated. debian/0.1.16-1-7-g79c74e2

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 69e10a9be188de39e944edfd2d33927d83209169
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Jun 16 13:06:54 2013 +0100

    Convert packaging from cdbs to dh

diff --git a/debian/changelog b/debian/changelog
index 40f56d4..004e95e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ telepathy-idle (0.1.16-2) UNRELEASED; urgency=low
   * Remove update-patches.mk and README.source: this is now a perfectly
     ordinary git-buildpackage + quilt package (and gbp-pq can be used to
     manipulate patches)
+  * Convert packaging from cdbs to dh
 
  -- Simon McVittie <smcv at debian.org>  Sun, 16 Jun 2013 12:48:48 +0100
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 24de06f..78996b2 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,8 @@ Uploaders: Dafydd Harries <daf at debian.org>,
            Sjoerd Simons <sjoerd at debian.org>,
            Laurent Bigonville <bigon at debian.org>,
            Jonny Lamb <jonny at debian.org>
-Build-Depends: debhelper (>= 5),
-               cdbs,
+Build-Depends: debhelper (>= 9),
+               dpkg-dev (>= 1.16.1),
                libglib2.0-dev (>= 2.30),
                libdbus-1-dev,
                libdbus-glib-1-dev (>= 0.51),
diff --git a/debian/rules b/debian/rules
index 4ff4c6a..b03bf46 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,22 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.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
 
-# Upstream releases are going to move CMs to libexecdir soon...
-DEB_CONFIGURE_LIBEXECDIR := "\$${prefix}/lib/telepathy"
-# but haven't done so yet, so let's give Debian a head start
-DEB_CONFIGURE_EXTRA_FLAGS := --bindir=$(DEB_CONFIGURE_LIBEXECDIR) --disable-silent-rules
+# Now that we use debhelper 9, dh_auto_configure defaults to
+# $libexecdir=$libdir, which might be better than this, but doesn't match
+# our historical practice (so it'd break old debugging instructions).
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--disable-silent-rules \
+		--libdir="\$${prefix}/lib" \
+		--libexecdir="\$${libdir}/telepathy" \
+		--disable-static \
+                $(NULL)
+
+# 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:
+	:

-- 
Idle packaging