[Pkg-telepathy-commits] [SCM] Salut packaging branch, debian-experimental, updated. debian/0.8.0-2-6-gd2abe58

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit dc256e167d4402af1215549953fa50d017ffb933
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Aug 7 11:03:17 2012 +0100

    Switch from cdbs to dh, based on the telepathy-gabble package

diff --git a/debian/changelog b/debian/changelog
index 892a738..2fbeeb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ telepathy-salut (0.8.0-3) UNRELEASED; urgency=low
   * Add debug-symbols package
   * Include default hardening flags from dpkg
   * Update to debhelper 9 compat level
+  * Switch from cdbs to dh, based on the telepathy-gabble package
 
  -- Simon McVittie <smcv at debian.org>  Tue, 07 Aug 2012 10:20:47 +0100
 
diff --git a/debian/control b/debian/control
index 8d76ce2..5e19fce 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Sjoerd Simons <sjoerd at debian.org>,
            Jonny Lamb <jonny at debian.org>
 Section: net
 Priority: optional
-Build-Depends: cdbs,
+Build-Depends: autotools-dev (>= 20100122-1~),
                debhelper (>= 9),
                dpkg-dev (>= 1.16.1~),
                libglib2.0-dev (>= 2.24.0),
diff --git a/debian/rules b/debian/rules
index c1550f1..f2a0fb0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,24 +2,40 @@
 
 include /usr/share/dpkg/default.mk
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
-# List any files which are not installed
-include /usr/share/cdbs/1/rules/utils.mk
-common-binary-post-install-arch:: list-missing
-
-# cdbs defaults to a subdirectory per source package, which is overkill for us
-DEB_CONFIGURE_LIBEXECDIR := "\$${prefix}/lib/telepathy"
-
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-olpc --disable-static
-
-DEB_DH_MAKESHLIBS_ARGS := -Xusr/lib/telepathy/salut-0/lib/
-
-include $(CURDIR)/debian/update-patches.mk
-
-install/telepathy-salut::
-	rm -f debian/telepathy-salut/usr/lib/telepathy/salut-0/lib/libsalut-plugins.la
-	rm -f debian/telepathy-salut/usr/lib/telepathy/salut-0/lib/libwocky.la
-	rm -f debian/telepathy-salut/usr/lib/telepathy/salut-0/lib/libsalut-plugins.so
-	rm -f debian/telepathy-salut/usr/lib/telepathy/salut-0/lib/libwocky.so
+%:
+	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
+# our historical practice (so it'd break old debugging instructions).
+# Leaving it as it was for now...
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libdir="\$${prefix}/lib" \
+		--libexecdir="\$${prefix}/lib/telepathy" \
+		--enable-olpc \
+		--disable-static \
+		$(NULL)
+
+# the regression tests are too race-prone to run on Debian buildds
+override_dh_auto_test:
+	:
+
+# remove the development symlinks - nothing in Debian should depend on these
+# private libraries
+override_dh_auto_install:
+	dh_auto_install
+	rm -f debian/tmp/usr/lib/telepathy/salut-0/plugins/*.la
+	rm -f debian/tmp/usr/lib/telepathy/salut-0/lib/*.la
+	rm -f debian/tmp/usr/lib/telepathy/salut-0/lib/libwocky.so
+	rm -f debian/tmp/usr/lib/telepathy/salut-0/lib/libsalut-plugins.so
+
+override_dh_install:
+	dh_install --list-missing
+
+override_dh_strip:
+	dh_strip --dbg-package=telepathy-salut-dbg
+
+# the libraries are considered private, nothing in Debian should depend on them
+override_dh_makeshlibs:
+	:
diff --git a/debian/telepathy-salut.docs b/debian/telepathy-salut.docs
new file mode 100644
index 0000000..6f83607
--- /dev/null
+++ b/debian/telepathy-salut.docs
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README

-- 
Salut packaging