[Pkg-telepathy-commits] [SCM] telepathy-glib packaging branch, debian, updated. debian/0.11.3-1-6-g2902742

Wed Apr 28 18:47:59 UTC 2010

The following commit has been merged in the debian branch:
commit 5b551b895434ce057164085080c313baefb2ec48
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Apr 28 18:57:41 2010 +0100

    Update debian/copyright

diff --git a/debian/changelog b/debian/changelog
index 35ca97a..2f48872 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ telepathy-glib (0.11.4-1) UNRELEASED; urgency=low
     - disable the new GObject-Introspection for the moment, I'll enable it in
       experimental first
     - increase GLib and gtk-doc dependencies
+  * Update debian/copyright
 
  -- Simon McVittie <smcv at debian.org>  Wed, 28 Apr 2010 18:30:54 +0100
 
diff --git a/debian/copyright b/debian/copyright
index f8fd4f2..924cbee 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,47 +1,91 @@
-This package was debianized by Simon McVittie <smcv at debian.org>
-on Fri Apr 20 2007.
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: Telepathy-GLib
+Maintainer: mailto:telepathy at lists.freedesktop.org
+Source: http://telepathy.freedesktop.org/releases/telepathy-glib/
 
-It was downloaded from:
-http://telepathy.freedesktop.org/releases/telepathy-glib/
+Files: *
+Copyright:
+    © 2005-2010 Collabora Limited
+    © 2005-2009 Nokia Corporation
+    © 2005, 2006 Free Software Foundation, Inc.
+    © 2006 INdT
+License: LGPL-2.1+
+
+Files:
+    examples/*,
+    tests/*,
+    tools/git-which-branch.sh,
+    tools/make-version-script.py,
+    tools/with-session-bus.sh
+Copyright:
+    © 2007-2010 Collabora Limited
+    © 2007-2009 Nokia Corporation
+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:
+    examples/cm/callable/*,
+    examples/future/call-cm/*
+Copyright:
+    © 2007-2010 Collabora Limited
+    © 2007-2009 Nokia Corporation
+License: LGPL-2.1+
+
+Files: debian/*
+Copyright:
+    © 2006 Daniel Holbach <daniel.holbach at ubuntu.com>
+    © 2006-2010 Collabora Limited
+License: LGPL-2.1+
 
+Files: m4/compiler.m4, m4/linker.m4
 Copyright:
-	 * Copyright © 2005-2010 Collabora Ltd.
-	 * Copyright © 2005-2010 Nokia Corporation
-
-Upstream Authors:
-
-Ross Burton <ross at burtonini.com>
-Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
-Dafydd Harries <dafydd.harries at collabora.co.uk>
-Robert McQueen <robert.mcqueen at collabora.co.uk>
-Simon McVittie <simon.mcvittie at collabora.co.uk>
-Mads Chr. Olesen <shiyee at shiyee.dk>
-Senko Rasic <senko.rasic at collabora.co.uk>
-Ole André Ravnaas <ole.andre.ravnaas at collabora.co.uk>
-Olli Salli <olli.salli at collabora.co.uk>
-Sjoerd Simons <sjoerd at luon.net>
-Rob Taylor <rob.taylor at collabora.co.uk>
+    © 2005 Scott James Remnant <scott at netsplit.com>.
+License: expat
 
+Files: m4/introspection.m4
+Copyright:
+    © 2009 Johan Dahlin
+License:
+    This file is free software; the author(s) gives unlimited
+    permission to copy and/or distribute it, with or without
+    modifications, as long as this notice is preserved.
+
+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.1 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.1'.
 
-On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
-
-The packaging is:
-
- * Copyright (C) 2006 Daniel Holbach <daniel.holbach at ubuntu.com>
- * Copyright (C) 2006-2010 Collabora Ltd. <http://www.collabora.co.uk/>
-
-and is licensed under the same terms as the software.
+License: expat
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+    .
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+    .
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-- 
telepathy-glib packaging

