[Pkg-telepathy-commits] [SCM] telepathy-glib packaging branch, debian-experimental, updated. debian/0.18.0-1-4-g3ec66e1

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit 358a87c4865906f804b705fd279eb71c0f0c89da
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Apr 4 17:33:22 2012 +0100

    Use the debhelper "gir" sequence from gobject-introspection

diff --git a/debian/changelog b/debian/changelog
index 9b12e99..9fdeebd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 telepathy-glib (0.18.0-2) UNRELEASED; urgency=low
 
   * Run dh_install with --list-missing to list anything we forgot
+  * Use the debhelper "gir" sequence from gobject-introspection
 
  -- Simon McVittie <smcv at debian.org>  Wed, 04 Apr 2012 17:32:27 +0100
 
diff --git a/debian/control b/debian/control
index e9bc948..38acc23 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: autotools-dev (>= 20100122-1~),
                dbus,
                debhelper (>= 8),
                gir1.2-glib-2.0,
-               gobject-introspection (>= 1.31.0),
+               gobject-introspection (>= 1.31.0-2~),
                libgirepository1.0-dev (>= 0.9.6),
                libglib2.0-dev (>= 2.28),
                libdbus-glib-1-dev (>= 0.82),
diff --git a/debian/rules b/debian/rules
index 30115ea..f45439f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with autotools_dev
+	dh $@ --with autotools_dev,gir
 
 override_dh_strip:
 	dh_strip --dbg-package=libtelepathy-glib0-dbg
@@ -26,10 +26,6 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 override_dh_install:
 	dh_install --list-missing
 
-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

-- 
telepathy-glib packaging