[Pkg-telepathy-commits] [SCM] telepathy-glib packaging branch, debian-experimental, updated. debian/0.21.1-1

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit b66347ef1cdfb8c39fc8bb5bbaae5d9b4edbe6c3
Merge: 225fa107bd58a999e2c30e939060607dbeda3ced 7a615b1c6f03bb8467075187747e2ad55e31b9f8
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jun 20 16:35:53 2013 +0100

    Merge branch 'debian' into debian-experimental
    
    Conflicts:
    	ChangeLog
    	NEWS
    	aclocal.m4
    	configure
    	configure.ac
    	docs/reference/html/index.html
    	docs/reference/html/telepathy-glib-TpPresenceMixin.html
    	docs/reference/html/telepathy-glib-asv.html
    	docs/reference/html/telepathy-glib-svc-account-manager.html
    	docs/reference/html/telepathy-glib-svc-account.html
    	docs/reference/html/telepathy-glib-svc-anonymity.html
    	docs/reference/html/telepathy-glib-svc-channel-auth.html
    	docs/reference/html/telepathy-glib-svc-channel-call.html
    	docs/reference/html/telepathy-glib-svc-channel-contactsearch.html
    	docs/reference/html/telepathy-glib-svc-channel-dispatch-operation.html
    	docs/reference/html/telepathy-glib-svc-channel-dispatcher.html
    	docs/reference/html/telepathy-glib-svc-channel-file-transfer.html
    	docs/reference/html/telepathy-glib-svc-channel-media.html
    	docs/reference/html/telepathy-glib-svc-channel-request.html
    	docs/reference/html/telepathy-glib-svc-channel-roomlist.html
    	docs/reference/html/telepathy-glib-svc-channel-text.html
    	docs/reference/html/telepathy-glib-svc-channel-tube.html
    	docs/reference/html/telepathy-glib-svc-channel-tubes.html
    	docs/reference/html/telepathy-glib-svc-channel.html
    	docs/reference/html/telepathy-glib-svc-connection-manager.html
    	docs/reference/html/telepathy-glib-svc-connection.html
    	docs/reference/html/telepathy-glib-svc-debug.html
    	docs/reference/html/telepathy-glib-svc-generic.html
    	docs/reference/html/telepathy-glib-svc-media-interfaces.html
    	docs/reference/html/telepathy-glib-svc-service-point.html
    	docs/reference/html/telepathy-glib-svc-tls.html
    	docs/reference/html/telepathy-glib-util.html
    	docs/reference/html/telepathy-glib-version.html
    	docs/reference/version.xml

diff --combined debian/changelog
index ce2b21b,32456f9..eee85f1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,17 +1,30 @@@
 +telepathy-glib (0.21.0-1) UNRELEASED; urgency=low
 +
 +  * Branch back to experimental
 +    - debian/gbp.conf: back to experimental branch
 +    - debian/watch: monitor all releases, not just stable ones
 +  * New upstream development release
 +    - this version fixes a circular reference between TpConnection and
 +      its self-contact property, but may cause application breakage in
 +      rare situations (TpConnection:self-contact did not previously become
 +      NULL when the connection was invalidated)
 +
 + -- Simon McVittie <smcv at debian.org>  Tue, 14 May 2013 10:13:40 +0100
 +
+ telepathy-glib (0.20.3-1) unstable; urgency=low
+ 
+   * New upstream release
+   * Canonicalize Vcs-*
+ 
+  -- Simon McVittie <smcv at debian.org>  Thu, 20 Jun 2013 16:15:42 +0100
+ 
+ telepathy-glib (0.20.2-2) unstable; urgency=medium
+ 
+   * Work around #709781 by skipping some test assertions on sparc,
+     fixing FTBFS on sparc (Closes: #709776)
+ 
+  -- Simon McVittie <smcv at debian.org>  Sat, 25 May 2013 13:40:34 +0100
+ 
  telepathy-glib (0.20.2-1) unstable; urgency=low
  
    * Move 0.20.x from experimental to unstable

-- 
telepathy-glib packaging