r34098 - in /desktop/unstable/gnome-desktop3/debian: changelog copyright

Tue Apr 3 17:13:15 UTC 2012

Author: biebl
Date: Tue Apr  3 17:13:13 2012
New Revision: 34098

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34098
Log:
Update debian/copyright using the machine-readable copyright format 1.0.

Modified:
    desktop/unstable/gnome-desktop3/debian/changelog
    desktop/unstable/gnome-desktop3/debian/copyright

Modified: desktop/unstable/gnome-desktop3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop3/debian/changelog?rev=34098&op=diff
==============================================================================

--- desktop/unstable/gnome-desktop3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-desktop3/debian/changelog [utf-8] Tue Apr  3 17:13:13 2012
@@ -7,8 +7,9 @@
   * debian/patches/01-clock_gettime.patch: Link libgnome-desktop against librt
     for clock_gettime().
   * Use dh-autoreconf to update the build system.
-
- -- Michael Biebl <biebl at debian.org>  Tue, 03 Apr 2012 18:58:14 +0200
+  * Update debian/copyright using the machine-readable copyright format 1.0.
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 03 Apr 2012 19:12:42 +0200
 
 gnome-desktop3 (3.2.1-3) unstable; urgency=low
 

Modified: desktop/unstable/gnome-desktop3/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop3/debian/copyright?rev=34098&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop3/debian/copyright [utf-8] (original)
+++ desktop/unstable/gnome-desktop3/debian/copyright [utf-8] Tue Apr  3 17:13:13 2012
@@ -1,46 +1,49 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn
-Name: gnome-desktop
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: gnome-desktop
 Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/
 
-Copyright:
-    Copyright (C) 1999, 2000, 2007, 2008 Red Hat Inc.
-    Copyright (C) 2001 Sid Vicious
-    Copyright (C) 1999 Free Software Foundation
-    Copyright (C) 2002, Sun Microsystems, Inc.
-    Copyright (C) 2003, Kristian Rietveld 
-    Copyright (C) 2000 Eazel, Inc.
-    Copyright (C) 1998 Tom Tromey
-    Copyright 2008, 2009, Novell, Inc.
-    Copyright (C) 2007 Guillaume Seguin <guillaume at segu.in>
+Files: *
+Copyright: 2007, 2008, 2010, 2011 Red Hat, Inc.
+           2008, 2009 Novell, Inc.
+           2000 Eazel, Inc.
+           2010 Carlos Garcia Campos <carlosgc at gnome.org>
+           1998 Tom Tromey
+           2010 Giovanni Campagna
+License: LGPL-2+
+ 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 General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in "/usr/share/common-licenses/LGPL-2".
 
-Upstream Authors:
-    Elliot Lee <sopwith at redhat.com>
-    George Lebl <jirka at 5z.com>
-    John Ellis <johne at bellatlantic.net>
-    Havoc Pennington <hp at redhat.com>
-    Anders Carlsson <andersca at gnu.org>
-    Vincent Untz <vuntz at gnome.org>
-    Federico Mena Quintero <federico at novell.com>
-
-License: LGPL-2+
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU 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 General Public License for more details.
-
-   You should have received a copy of the GNU 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
-
-Files: libgnome-desktop/edid-parse.c, libgnome-desktop/display-name.c
+Files: libgnome-desktop/edid-parse.c
+       libgnome-desktop/display-name.c
+Copyright: 2007 Red Hat, Inc.
 License: MIT/X11 (BSD like)
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
+ 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 X CONSORTIUM 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.


