[Pkg-telepathy-commits] [SCM] telepathy-glib packaging branch, debian, updated. debian/0.11.8-1-6-g2868a9a

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 3547f18a088be924cc5bddd242c8b9692bb586f2
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Jul 2 18:11:56 2010 +0100

    Adjust mechanism for symlinking together doc directories so it works if dh-buildinfo is installed

diff --git a/debian/changelog b/debian/changelog
index 47f372b..9132033 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ telepathy-glib (0.11.9-1) UNRELEASED; urgency=low
   * New upstream version (new API/ABI)
   * Remove temporary workaround for #586742
   * Standards-Version: 3.9.0 (no changes needed)
+  * Adjust mechanism for symlinking together doc directories so it works if
+    dh-buildinfo is installed
 
  -- Simon McVittie <smcv at debian.org>  Fri, 02 Jul 2010 16:40:43 +0100
 
diff --git a/debian/control b/debian/control
index 976cd7e..39f8485 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Uploaders: Dafydd Harries <daf at debian.org>,
            Jonny Lamb <jonny at debian.org>
 Build-Depends: cdbs,
                dbus,
-               debhelper (>= 5),
+               debhelper (>= 7.4.2),
                gir1.0-glib-2.0,
                gobject-introspection (>= 0.6.14),
                libgirepository1.0-dev (>= 0.6.14),
diff --git a/debian/gir1.0-telepathyglib-0.12.links b/debian/gir1.0-telepathyglib-0.12.links
deleted file mode 100644
index 15298b0..0000000
--- a/debian/gir1.0-telepathyglib-0.12.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/libtelepathy-glib0 usr/share/doc/gir1.0-telepathyglib-0.12
diff --git a/debian/libtelepathy-glib-dev.links b/debian/libtelepathy-glib-dev.links
deleted file mode 100644
index d415425..0000000
--- a/debian/libtelepathy-glib-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/libtelepathy-glib0 usr/share/doc/libtelepathy-glib-dev
diff --git a/debian/libtelepathy-glib0-dbg.links b/debian/libtelepathy-glib0-dbg.links
deleted file mode 100644
index 393ec0d..0000000
--- a/debian/libtelepathy-glib0-dbg.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/libtelepathy-glib0 usr/share/doc/libtelepathy-glib0-dbg
diff --git a/debian/rules b/debian/rules
index 32539ce..9c51315 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,11 +27,11 @@ $(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) ::
 	dh_girepository -p$(cdbs_curpkg)
 
 # we symlink many of the doc directories together
-DEB_INSTALL_DOCS_libtelepathy-glib0-dbg := --no-act
-DEB_INSTALL_CHANGELOGS_libtelepathy-glib0-dbg := --no-act
-DEB_INSTALL_DOCS_libtelepathy-glib-dev := --no-act
-DEB_INSTALL_CHANGELOGS_libtelepathy-glib-dev := --no-act
-DEB_INSTALL_DOCS_gir1.0-telepathyglib-0.12 := --no-act
-DEB_INSTALL_CHANGELOGS_gir1.0-telepathyglib-0.12 := --no-act
+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
 
 include $(CURDIR)/debian/update-patches.mk

-- 
telepathy-glib packaging