[Pkg-telepathy-commits] [SCM] Butterfly packaging branch, debian, updated. debian/0.5.6-1-17-geefb2f3

[Jonny Lamb]

The following commit has been merged in the debian branch:
commit 7ff125832fad5ddaae9cf5bd0e0f31416e3b4016
Author: Jonny Lamb <jonny at debian.org>
Date:   Sat Apr 3 23:50:52 2010 +0100

    debian/copyright: Updated.

diff --git a/debian/changelog b/debian/changelog
index 078fc65..d89f079 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 telepathy-butterfly (0.5.7-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/copyright: Updated.
 
- -- Jonny Lamb <jonny at debian.org>  Sat, 03 Apr 2010 23:48:27 +0100
+ -- Jonny Lamb <jonny at debian.org>  Sat, 03 Apr 2010 23:50:46 +0100
 
 telepathy-butterfly (0.5.6-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 71f6871..2e8a55b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,15 +3,19 @@ Thu, 21 Sep 2006 22:51:32 +0200.
 
 It was downloaded from http://telepathy.freedesktop.org/releases/telepathy-butterfly/
 
-Upstream Author: 
+Upstream Author:
 	Ali Sabil علي سبيل <ali.sabil at gmail.com>
 	Johann Prieur <johann.prieur at gmail.com>
+        Jonny Lamb <jonny.lamb at collabora.co.uk>
+        Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne at collabora.co.uk>
+        Olivier Le Thanh Duong <olivier at lethanh.be>
 
 Copyright:
   Copyright © 2005-2007 Ali Sabil <ali.sabil at gmail.com>
   Copyright © 2007 Johann Prieur <johann.prieur at gmail.com>
-  Copyright © 2007  Ole André Vadla Ravnås <oleavr at gmail.com>
+  Copyright © 2007 Ole André Vadla Ravnås <oleavr at gmail.com>
   Copyright © 2009 Olivier Le Thanh Duong <olivier at lethanh.be>
+  Copyright © 2009-2010 Collabora Ltd.
 
 License:
    This package is free software; you can redistribute it and/or modify
@@ -28,7 +32,7 @@ License:
    along with this package; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-On Debian systems, the complete text of the GNU General Public License can 
+On Debian systems, the complete text of the GNU General Public License can
 be found in /usr/share/common-licenses/GPL.
 
 The Debian packaging is © 2006, Samuel Maftoul <samuel.maftoul at gmail.com> and

-- 
Butterfly packaging