[Pkg-telepathy-commits] [SCM] MC 5 packaging branch, debian-experimental, updated. debian/1%5.14.1-2-123-g9960989

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit eddfbfcbc8c083fb419093025d8871081cdf764b
Merge: 3fa74eba47d75818c1b6d627e7728da315505b73 b6a9fe20ab8bdf0be7d8d1720c668a65d8147492
Author: Simon McVittie <smcv at debian.org>
Date:   Fri May 17 10:20:30 2013 +0100

    Merge branch 'debian' into debian-experimental

diff --combined debian/changelog
index 7b346de,ea3f121..ee2f8fa
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,14 +1,22 @@@
 +telepathy-mission-control-5 (1:5.15.0-1) UNRELEASED; urgency=low
 +
 +  * New upstream development release
 +    - this release migrates the on-disk format of account parameters
 +    - update symbols file
 +
 + -- Simon McVittie <smcv at debian.org>  Fri, 03 May 2013 15:08:59 +0100
 +
+ telepathy-mission-control-5 (1:5.14.1-2) unstable; urgency=low
+ 
+   * Use dh_autoreconf
+   * Bump symbol versioning for mcp_account_storage_get_type() to 1:5.13.0~
+     so that plugins that could rely on ::altered-one working correctly will
+     depend on this version
+   * Standards-Version: 3.9.4
+   * Upload to unstable
+ 
+  -- Simon McVittie <smcv at debian.org>  Fri, 17 May 2013 10:19:41 +0100
+ 
  telepathy-mission-control-5 (1:5.14.1-1) experimental; urgency=low
  
    * New upstream stable release
@@@ -42,7 -45,7 +53,7 @@@ telepathy-mission-control-5 (1:5.13.1-1
  
  telepathy-mission-control-5 (1:5.12.1-1) experimental; urgency=low
  
-   * New upstream release.
+   * New upstream release. (Closes: #683151)
    * debian/gbp.conf: Set experimental branch names again.
  
   -- Jonny Lamb <jonny at debian.org>  Wed, 11 Jul 2012 16:17:34 +0100
diff --combined debian/libmission-control-plugins0.symbols
index 5a9d940,e33ccb7..363ba00
--- a/debian/libmission-control-plugins0.symbols
+++ b/debian/libmission-control-plugins0.symbols
@@@ -1,17 -1,11 +1,17 @@@
  libmission-control-plugins.so.0 libmission-control-plugins0 #MINVER#
 + mcp_account_manager_escape_value_for_keyfile at Base 1:5.15.0
 + mcp_account_manager_escape_variant_for_keyfile at Base 1:5.15.0
   mcp_account_manager_get_type at Base 5.5.0~
   mcp_account_manager_get_unique_name at Base 5.5.0~
   mcp_account_manager_get_value at Base 5.5.0~
 + mcp_account_manager_init_value_for_attribute at Base 1:5.15.0
   mcp_account_manager_list_keys at Base 1:5.5.2
   mcp_account_manager_parameter_is_secret at Base 5.5.0~
   mcp_account_manager_parameter_make_secret at Base 5.5.0~
 + mcp_account_manager_set_attribute at Base 1:5.15.0
 + mcp_account_manager_set_parameter at Base 1:5.15.0
   mcp_account_manager_set_value at Base 5.5.0~
 + mcp_account_manager_unescape_value_from_keyfile at Base 1:5.15.0
   mcp_account_storage_commit at Base 5.5.0~
   mcp_account_storage_commit_one at Base 1:5.5.2
   mcp_account_storage_create at Base 1:5.13.1~
@@@ -27,7 -21,7 +27,7 @@@
   mcp_account_storage_get_additional_info at Base 1:5.5.4
   mcp_account_storage_get_identifier at Base 1:5.5.4
   mcp_account_storage_get_restrictions at Base 1:5.5.4
-  mcp_account_storage_get_type at Base 5.5.0~
+  mcp_account_storage_get_type at Base 1:5.13.0~
   mcp_account_storage_iface_implement_commit at Base 5.5.0~
   mcp_account_storage_iface_implement_commit_one at Base 1:5.5.2
   mcp_account_storage_iface_implement_create at Base 1:5.13.1~
@@@ -45,13 -39,10 +45,13 @@@
   mcp_account_storage_iface_set_provider at Base 1:5.5.4
   mcp_account_storage_list at Base 5.5.0~
   mcp_account_storage_name at Base 5.5.0~
 + mcp_account_storage_owns at Base 1:5.15.0
   mcp_account_storage_priority at Base 5.5.0~
   mcp_account_storage_provider at Base 1:5.5.4
   mcp_account_storage_ready at Base 5.5.0~
   mcp_account_storage_set at Base 5.5.0~
 + mcp_account_storage_set_attribute at Base 1:5.15.0
 + mcp_account_storage_set_parameter at Base 1:5.15.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~

-- 
MC 5 packaging