[Pkg-telepathy-commits] [SCM] MC 5 packaging branch, debian-experimental, updated. debian/5.4.3-1-13-g6382422

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit d0fe1b0b6605e037be2e0ef7bd72fac70637dcaf
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Jul 27 11:30:46 2010 +0100

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index 072cf5c..4d35b8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
-telepathy-mission-control-5 (1:5.5.2-2) UNRELEASED; urgency=low
+telepathy-mission-control-5 (1:5.5.3-1) UNRELEASED; urgency=low
 
-  * Bump telepathy-glib dependency to 0.11.7 (also needed for previous
-    version)
+  * New upstream release
+    - update libmission-control-plugins0.symbols
+  * Bump telepathy-glib dependency to 0.11.9
+  * Make symlinked documentation directories work correctly if dh_buildinfo is
+    installed
 
  -- Simon McVittie <smcv at debian.org>  Thu, 17 Jun 2010 11:33:11 +0100
 
diff --git a/debian/control b/debian/control
index bf979f8..efef4c1 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: cdbs,
                libdbus-glib-1-dev (>= 0.82),
                libglib2.0-dev (>= 2.24),
                libgnome-keyring-dev,
-               libtelepathy-glib-dev (>= 0.11.7),
+               libtelepathy-glib-dev (>= 0.11.9),
                pkg-config (>= 0.21),
                python (>= 2.5),
                xsltproc
diff --git a/debian/libmission-control-plugins0.symbols b/debian/libmission-control-plugins0.symbols
index 212c961..346b079 100644
--- a/debian/libmission-control-plugins0.symbols
+++ b/debian/libmission-control-plugins0.symbols
@@ -28,6 +28,16 @@ libmission-control-plugins.so.0 libmission-control-plugins0 #MINVER#
  mcp_account_storage_ready at Base 5.5.0~
  mcp_account_storage_set at Base 5.5.0~
  mcp_add_object at Base 5.5.0~
+ mcp_dbus_acl_authorised at Base 1:5.5.3~
+ mcp_dbus_acl_authorised_async at Base 1:5.5.3~
+ mcp_dbus_acl_authorised_async_step at Base 1:5.5.3~
+ mcp_dbus_acl_description at Base 1:5.5.3~
+ mcp_dbus_acl_get_type at Base 1:5.5.3~
+ mcp_dbus_acl_iface_implement_authorised at Base 1:5.5.3~
+ mcp_dbus_acl_iface_implement_authorised_async at Base 1:5.5.3~
+ mcp_dbus_acl_iface_set_desc at Base 1:5.5.3~
+ mcp_dbus_acl_iface_set_name at Base 1:5.5.3~
+ mcp_dbus_acl_name at Base 1:5.5.3~
  mcp_dispatch_operation_close_channels at Base 5.5.0~
  mcp_dispatch_operation_destroy_channels at Base 5.5.0~
  mcp_dispatch_operation_end_delay at Base 5.5.0~
diff --git a/debian/rules b/debian/rules
index 9da52fe..1f70f9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,10 +32,21 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
 	--with-html-dir=\$${prefix}/share/doc/libmission-control-plugins-doc
 
 # we symlink some of the doc directories together
-DEB_INSTALL_DOCS_telepathy-mission-control-5-dbg := --no-act
-DEB_INSTALL_CHANGELOGS_telepathy-mission-control-5-dbg := --no-act
-DEB_INSTALL_DOCS_libmission-control-plugins-dev := --no-act
-DEB_INSTALL_CHANGELOGS_libmission-control-plugins-dev := --no-act
+DEB_INSTALL_DOCS_ALL :=
+DEB_INSTALL_DOCS_telepathy-mission-control-5 := README NEWS AUTHORS
+DEB_INSTALL_DOCS_telepathy-mission-control-5-dbg := --link-doc=telepathy-mission-control-5
+DEB_INSTALL_DOCS_libmission-control-plugins-dev := --link-doc=libmission-control-plugins0
+
+debian/stamp-buildinfo: insist-on-symlinks
+insist-on-symlinks:
+	for p in libmission-control-plugins-dev; do \
+		install -d debian/$$p/usr/share/doc || exit $$?; \
+		ln -s libmission-control-plugins0 debian/$$p/usr/share/doc/$$p || exit $$?; \
+	done
+	for p in telepathy-mission-control-5-dbg; do \
+		install -d debian/$$p/usr/share/doc || exit $$?; \
+		ln -s telepathy-mission-control-5 debian/$$p/usr/share/doc/$$p || exit $$?; \
+	done
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
diff --git a/debian/telepathy-mission-control-5-dbg.links b/debian/telepathy-mission-control-5-dbg.links
deleted file mode 100644
index ef1e0a5..0000000
--- a/debian/telepathy-mission-control-5-dbg.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/telepathy-mission-control-5 usr/share/doc/telepathy-mission-control-5-dbg

-- 
MC 5 packaging