[Pkg-telepathy-commits] [SCM] telepathy-glib packaging branch, bpo-lenny, updated. debian/0.10.1-1-4-g441c7a8

[Simon McVittie]

The following commit has been merged in the bpo-lenny branch:
commit 441c7a8f97bdabeca4ba647a80fc50e022f400f2
Merge: 00d5559634bb44968c16fd7aa6d4dea06c8d7c7f 9ad52581867ebf5a271538b44b3664e526c13799
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Mar 24 19:31:13 2010 +0000

    Merge branch 'debian' into bpo-lenny
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index a9718dd,0137349..649e0c9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,12 +1,20 @@@
- telepathy-glib (0.10.0-1~bpo50+1) UNRELEASED-lenny-backports; urgency=low
++telepathy-glib (0.10.1-1~bpo50+1) UNRELEASED-lenny-backports; urgency=low
 +
 +  * (Not to be released until 0.10.0-1 reaches squeeze, as per bpo policy.)
 +  * Rebuild for lenny-backports
 +  * Switch debian/gbp.conf to be suitable for making lenny backports
 +
 + -- Simon McVittie <smcv at debian.org>  Thu, 21 Jan 2010 13:31:00 +0000
 +
+ telepathy-glib (0.10.1-1) unstable; urgency=low
+ 
+   * New upstream stable-branch version (no new API/ABI)
+   * Standards-Version: 3.8.4 (no changes needed)
+   * Explicitly use source format 1.0 for now, to remain compatible with
+     Maemo 5
+ 
+  -- Simon McVittie <smcv at debian.org>  Wed, 24 Mar 2010 19:17:16 +0000
+ 
  telepathy-glib (0.10.0-1) unstable; urgency=low
  
    * New upstream stable-branch version (no new API/ABI)
@@@ -15,13 -16,6 +24,13 @@@
  
   -- Simon McVittie <smcv at debian.org>  Thu, 21 Jan 2010 13:14:40 +0000
  
 +telepathy-glib (0.9.1-1~bpo50+1) lenny-backports; urgency=low
 +
 +  * Rebuild for lenny.
 +  * Add myself as an uploader.
 +
 + -- Andres Salomon <dilinger at debian.org>  Wed, 02 Dec 2009 21:27:39 +0000
 +
  telepathy-glib (0.9.2-1) unstable; urgency=low
  
    * New upstream version with new API/ABI.
diff --combined debian/control
index 7aeca28,9d55003..e3ee8df
--- a/debian/control
+++ b/debian/control
@@@ -6,7 -6,6 +6,7 @@@ Uploaders: Dafydd Harries <daf at debian.o
             Simon McVittie <smcv at debian.org>,
             Sjoerd Simons <sjoerd at debian.org>,
             Laurent Bigonville <bigon at debian.org>,
 +           Andres Salomon <dilinger at debian.org>,
             Jonny Lamb <jonny at debian.org>
  Build-Depends: cdbs,
                 dbus,
@@@ -18,7 -17,7 +18,7 @@@
                 python,
                 gtk-doc-tools (>= 1.10),
                 pkg-config (>= 0.21)
- Standards-Version: 3.8.3
+ Standards-Version: 3.8.4
  Vcs-Git: git://git.debian.org/git/pkg-telepathy/telepathy-glib.git
  Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/telepathy-glib.git
  Homepage: http://telepathy.freedesktop.org/wiki/

-- 
telepathy-glib packaging