[Pkg-telepathy-commits] [SCM] telepathy-glib packaging branch, debian-experimental, updated. debian/0.11.14-1-8-g81d53fd

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit c986350a87de80d0a74717098c94d0541d23e352
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Sep 13 14:53:45 2010 +0100

    Stop using cdbs, use dh instead

diff --git a/debian/changelog b/debian/changelog
index fd8a587..fddecfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ telepathy-glib (0.11.15-1) UNRELEASED; urgency=low
   * New upstream version (new API, ABI)
   * Advance debhelper compat mode to 8
   * Use the 3.0 (quilt) source format
+  * Stop using cdbs, use dh instead
 
  -- Simon McVittie <smcv at debian.org>  Mon, 13 Sep 2010 13:35:00 +0100
 
diff --git a/debian/control b/debian/control
index 7471211..df741c1 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,7 @@ Uploaders: Dafydd Harries <daf at debian.org>,
            Laurent Bigonville <bigon at debian.org>,
            Jonny Lamb <jonny at debian.org>,
            Adam Conrad <adconrad at 0c3.net>
-Build-Depends: cdbs,
-               dbus,
+Build-Depends: dbus,
                debhelper (>= 8),
                gir1.0-glib-2.0,
                gobject-introspection (>= 0.6.14),
diff --git a/debian/libtelepathy-glib-doc.docs b/debian/libtelepathy-glib-doc.docs
new file mode 100644
index 0000000..6f83607
--- /dev/null
+++ b/debian/libtelepathy-glib-doc.docs
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README
diff --git a/debian/libtelepathy-glib0.docs b/debian/libtelepathy-glib0.docs
new file mode 100644
index 0000000..6f83607
--- /dev/null
+++ b/debian/libtelepathy-glib0.docs
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README
diff --git a/debian/rules b/debian/rules
index 2229fba..c9de1d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,20 @@
 #!/usr/bin/make -f
 
-DEB_DH_MAKESHLIBS_ARGS_libtelepathy-glib0 := -V"libtelepathy-glib0 (>= 0.11.15)"
+%:
+	dh $@
 
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+override_dh_strip:
+	dh_strip --dbg-package=libtelepathy-glib0-dbg
 
-# We don't want the .la files, but complain if anything else is missing
-binary-post-install/libtelepathy-glib-dev::
-	rm -f debian/tmp/usr/lib/*.la
-common-binary-post-install-arch:: list-missing
+override_dh_makeshlibs:
+	dh_makeshlibs -V"libtelepathy-glib0 (>= 0.11.15)"
 
-DEB_DH_STRIP_ARGS := --dbg-package=libtelepathy-glib0-dbg
+override_dh_auto_install:
+	dh_auto_install
+	rm -f debian/tmp/usr/lib/*.la
 
-DEB_MAKE_CHECK_TARGET := check
-DEB_CONFIGURE_EXTRA_FLAGS := \
+override_dh_auto_configure:
+	dh_auto_configure -- \
 	--disable-Werror \
 	--enable-introspection \
 	--enable-vala-bindings \
@@ -23,20 +23,11 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
-$(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) ::
-	dh_girepository -p$(cdbs_curpkg)
-
-# we symlink many of the doc directories together
-DEB_INSTALL_DOCS_ALL :=
-DEB_INSTALL_DOCS_libtelepathy-glib0 := README NEWS AUTHORS
-DEB_INSTALL_DOCS_libtelepathy-glib-doc := README NEWS AUTHORS
-DEB_INSTALL_DOCS_libtelepathy-glib0-dbg := --link-doc=libtelepathy-glib0
-DEB_INSTALL_DOCS_libtelepathy-glib-dev := --link-doc=libtelepathy-glib0
-DEB_INSTALL_DOCS_gir1.0-telepathyglib-0.12 := --link-doc=libtelepathy-glib0
-
-debian/stamp-buildinfo: insist-on-symlinks
-insist-on-symlinks:
-	for p in libtelepathy-glib0-dbg libtelepathy-glib-dev gir1.0-telepathyglib-0.12; do \
-		install -d debian/$$p/usr/share/doc || exit $$?; \
-		ln -s libtelepathy-glib0 debian/$$p/usr/share/doc/$$p || exit $$?; \
-	done
+override_dh_shlibdeps:
+	dh_shlibdeps
+	dh_girepository
+
+# the doc package doesn't depend on the shared library, so can't symlink
+override_dh_installdocs:
+	dh_installdocs -a --link-doc=libtelepathy-glib0
+	dh_installdocs -i

-- 
telepathy-glib packaging