[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 49131fa4c700f07e7a4a5b62e8df1fa8e4f7bf3b
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Jul 2 16:43:10 2010 +0100

    Remove temporary workaround for #586742

diff --git a/debian/changelog b/debian/changelog
index 59350d2..ab624b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 telepathy-glib (0.11.9-1) UNRELEASED; urgency=low
 
   * New upstream version (new API/ABI)
+  * Remove temporary workaround for #586742
 
  -- Simon McVittie <smcv at debian.org>  Fri, 02 Jul 2010 16:40:43 +0100
 
diff --git a/debian/rules b/debian/rules
index 25ea7b5..32539ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,16 +26,6 @@ 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