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

[Simon McVittie]

The following commit has been merged in the debian branch:
commit b8fcb5d51ab5016c94df8b6b7cf1f92dfdd0c7d7
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Jun 22 13:45:25 2010 +0100

    Work around #586742 in cdbs by specifying docs explicitly

diff --git a/debian/changelog b/debian/changelog
index eb6e036..7a9634d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ telepathy-glib (0.11.8-1) unstable; urgency=low
   * New upstream version (no new API/ABI)
     - requires gobject-introspection 0.6.14
   * Remove duplicate 'Section: libs' from control
+  * Work around #586742 in cdbs by specifying docs explicitly
 
  -- Simon McVittie <smcv at debian.org>  Tue, 22 Jun 2010 12:45:56 +0100
 
diff --git a/debian/rules b/debian/rules
index 32539ce..25ea7b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,16 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 $(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) ::
 	dh_girepository -p$(cdbs_curpkg)
 
+# workaround for Bug#586742 in cdbs
+DEB_INSTALL_DOCS_ALL :=
+DEB_INSTALL_CHANGELOGS_ALL :=
+docs = ./README ./NEWS ./AUTHORS
+changelogs = ./ChangeLog
+DEB_INSTALL_DOCS_libtelepathy-glib-doc := $(docs)
+DEB_INSTALL_CHANGELOGS_libtelepathy-glib-doc := $(changelogs)
+DEB_INSTALL_DOCS_libtelepathy-glib0 := $(docs)
+DEB_INSTALL_CHANGELOGS_libtelepathy-glib0 := $(changelogs)
+
 # we symlink many of the doc directories together
 DEB_INSTALL_DOCS_libtelepathy-glib0-dbg := --no-act
 DEB_INSTALL_CHANGELOGS_libtelepathy-glib0-dbg := --no-act

-- 
telepathy-glib packaging