[Pkg-telepathy-commits] [SCM] MC 5 packaging branch, debian-experimental, updated. debian/5.6.0-1-9-gfbf9f1e

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit 6220f4d4cbb9ae61d28a6412db1d2340660dc0a1
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Nov 17 12:09:41 2010 +0000

    Move to debhelper 8

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8
diff --git a/debian/control b/debian/control
index dbfdb56..98eca10 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers at lists.alioth
 Uploaders: Simon McVittie <smcv at debian.org>,
            Jonny Lamb <jonny at debian.org>,
            Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: cdbs,
-               debhelper (>= 5),
+Build-Depends: autotools-dev (>= 20100122-1~),
+               debhelper (>= 8),
                gtk-doc-tools,
                libdbus-1-dev (>= 1.0),
                libdbus-glib-1-dev (>= 0.82),
diff --git a/debian/rules b/debian/rules
index 1f70f9b..d0a42e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,29 +1,27 @@
 #!/usr/bin/make -f
 
-DEB_DH_MAKESHLIBS_ARGS_libmission-control-plugins0 := -V
+%:
+	dh $@ --with autotools_dev
 
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+override_dh_makeshlibs:
+	dh_makeshlibs -V
 
 # Having a static library for a plugin loader is pretty useless, so get rid
-# of it. We don't want the libtool stuff either, but we do want to list any
-# other missing files.
-common-binary-post-install-arch:: list-missing
-list-missing: remove-cruft
-remove-cruft:
+# of it. We don't want the libtool stuff either.
+override_dh_auto_install:
+	dh_auto_install
 	rm -f debian/tmp/usr/lib/libmission-control-plugins*.a
 	rm -f debian/tmp/usr/lib/libmission-control-plugins*.la
 
-DEB_DH_STRIP_ARGS := --dbg-package=telepathy-mission-control-5-dbg
-
-DEB_CONFIGURE_LIBEXECDIR := "\$${prefix}/lib/telepathy"
+override_dh_strip:
+	dh_strip --dbg-package=telepathy-mission-control-5-dbg
 
 # Explicitly disable old-style plugins, which has the side-effect of disabling
 # their associated documentation, making their libraries static, and disabling
 # their headers
-DEB_CONFIGURE_EXTRA_FLAGS := \
+override_dh_auto_configure:
+	dh_auto_configure -- \
+	--libexecdir=\$${prefix}/lib/telepathy \
 	--disable-Werror \
 	--disable-mcd-plugins \
 	--enable-gtk-doc \
@@ -32,22 +30,11 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
 	--with-html-dir=\$${prefix}/share/doc/libmission-control-plugins-doc
 
 # we symlink some of the doc directories together
-DEB_INSTALL_DOCS_ALL :=
-DEB_INSTALL_DOCS_telepathy-mission-control-5 := README NEWS AUTHORS
-DEB_INSTALL_DOCS_telepathy-mission-control-5-dbg := --link-doc=telepathy-mission-control-5
-DEB_INSTALL_DOCS_libmission-control-plugins-dev := --link-doc=libmission-control-plugins0
-
-debian/stamp-buildinfo: insist-on-symlinks
-insist-on-symlinks:
-	for p in libmission-control-plugins-dev; do \
-		install -d debian/$$p/usr/share/doc || exit $$?; \
-		ln -s libmission-control-plugins0 debian/$$p/usr/share/doc/$$p || exit $$?; \
-	done
-	for p in telepathy-mission-control-5-dbg; do \
-		install -d debian/$$p/usr/share/doc || exit $$?; \
-		ln -s telepathy-mission-control-5 debian/$$p/usr/share/doc/$$p || exit $$?; \
-	done
+override_dh_installdocs:
+	dh_installdocs -ptelepathy-mission-control-5-dbg \
+		--link-doc=telepathy-mission-control-5
+	dh_installdocs -plibmission-control-plugins-dev \
+		--link-doc=libmission-control-plugins0
+	dh_installdocs --remaining-packages
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
-
-include $(CURDIR)/debian/update-patches.mk
diff --git a/debian/telepathy-mission-control-5.docs b/debian/telepathy-mission-control-5.docs
new file mode 100644
index 0000000..6f83607
--- /dev/null
+++ b/debian/telepathy-mission-control-5.docs
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README

-- 
MC 5 packaging