[Pkg-telepathy-commits] [SCM] telepathy-spec packaging branch, debian, updated. debian/0.17.28-1-15-gcbcef5f

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 9920c74d48baa67b465b28283a30f601a6bcde12
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Apr 16 15:27:11 2010 +0100

    Use machine-readable copyright format
    
    * Use machine-readable copyright format
    * Relicense packaging to be the same as the spec (with bigon's permission)

diff --git a/debian/changelog b/debian/changelog
index 45e36e3..12bf5af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 telepathy-spec (0.19.5-1) unstable; urgency=low
 
   * New upstream version(s)
+  * Use machine-readable copyright format
+  * Relicense packaging to be the same as the spec (with bigon's permission)
 
  -- Simon McVittie <smcv at debian.org>  Fri, 16 Apr 2010 14:51:36 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 6adb2dc..1a3d452 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,51 +1,43 @@
-This package was debianized by Laurent Bigonville <bigon at bigon.be> on
-Sun, 23 Sep 2007 02:20:59 +0200
-
-It was downloaded from:
-          <http://telepathy.freedesktop.org/releases/telepathy-spec/>
-
-Upstream Authors: 
-
-     Daniel d'Andrada T. de Carvalho <daniel.carvalho at indt.org.br>
-     Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
-     Julien Gilli <jgilli at acm.org>
-     Dafydd Harries <dafydd.harries at collabora.co.uk>
-     Tobias Hunger <tobias.hunger at basyskom.de>
-     Andre Magalhaes <andrunko at gmail.com>
-     Robert McQueen <robert.mcqueen at collabora.co.uk>
-     Simon McVittie <simon.mcvittie at collabora.co.uk>
-     Mads Chr. Olesen <shiyee at gmail.com>
-     Senko Rasic <senko.rasic at collabora.co.uk>
-     Ole Andre Vadla Ravnaas <ole.andre.ravnaas at collabora.co.uk>
-     Olli Salli <olli.salli at collabora.co.uk>
-     Sjoerd Simons <sjoerd at luon.net>
-     Raphael Slinckx <raphael at slinckx.net>
-     Rob Taylor <rob.taylor at codethink.co.uk>
-
-Copyright: 
-
-    Copyright (C) 2005-2009 Collabora Limited
-    Copyright (C) 2005-2009 Nokia Corporation
-    Copyright (C) 2006 INdT
-
-License:
-
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: Telepathy D-Bus API Specification
+Maintainer: mailto:telepathy at lists.freedesktop.org
+Source: http://telepathy.freedesktop.org/releases/telepathy-spec/
+
+Files: *
+Copyright:
+    © 2005-2010 Collabora Limited
+    © 2005-2010 Nokia Corporation
+    © 2006 INdT
+License: LGPL-2.1+
+
+Files: tools/git-which-branch.sh
+Copyright: © 2008 Collabora Limited
+License: GNU-permissive
+    Copying and distribution of this file, with or without modification,
+    are permitted in any medium without royalty provided the copyright
+    notice and this notice are preserved.
+
+Files: debian/*
+Copyright:
+    © 2007 Laurent Bigonville <bigon at bigon.be>
+    © 2007-2010 Collabora Limited
+    © 2007-2009 Nokia Corporation
+License: LGPL-2.1+
+
+License: LGPL-2.1+
     This package is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
-
+    .
     This package is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Lesser General Public License for more details.
-
+    .
     You should have received a copy of the GNU Lesser General Public
     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 Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL-2'.
-
-The Debian packaging is (C) 2007, Laurent Bigonville <bigon at bigon.be> and
-is licensed under the GPL-2, see `/usr/share/common-licenses/GPL-2'.
+    .
+    On Debian systems, the complete text of the GNU Lesser General
+    Public License can be found in `/usr/share/common-licenses/LGPL-2'.

-- 
telepathy-spec packaging