r34221 - in /desktop/unstable/gnome-screensaver/debian: changelog copyright

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Sun Apr 15 14:30:42 UTC 2012


Author: biebl
Date: Sun Apr 15 14:30:42 2012
New Revision: 34221

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

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

Modified: desktop/unstable/gnome-screensaver/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-screensaver/debian/changelog?rev=34221&op=diff
==============================================================================
--- desktop/unstable/gnome-screensaver/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-screensaver/debian/changelog [utf-8] Sun Apr 15 14:30:42 2012
@@ -3,8 +3,10 @@
   * New upstream release.
   * Update Vcs-* URLs.
   * Bump Standards-Version to 3.9.3.
-
- -- Michael Biebl <biebl at debian.org>  Sun, 15 Apr 2012 16:21:06 +0200
+  * Update and rewrite debian/copyright using the machine-readable copyright
+    format 1.0.
+
+ -- Michael Biebl <biebl at debian.org>  Sun, 15 Apr 2012 16:30:16 +0200
 
 gnome-screensaver (3.4.0-1) unstable; urgency=low
 

Modified: desktop/unstable/gnome-screensaver/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-screensaver/debian/copyright?rev=34221&op=diff
==============================================================================
--- desktop/unstable/gnome-screensaver/debian/copyright [utf-8] (original)
+++ desktop/unstable/gnome-screensaver/debian/copyright [utf-8] Sun Apr 15 14:30:42 2012
@@ -1,105 +1,26 @@
-This package was debianized by Guilherme de S. Pastore <guilherme.pastore at terra.com.br> on
-Sat,  9 Jul 2005 18:16:18 -0300.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: gnome-screensaver
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-screensaver/
 
-It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/gnome-screensaver
-
-Upstream Author: William Jon McCann <mccann at jhu.edu>
-
-xscreensaver
-      Copyright (C) 1991-2004 Jamie Zawinski <jwz at jwz.org>
-
-      Permission to use, copy, modify, distribute, and sell this software and its
-      documentation for any purpose is hereby granted without fee, provided that
-      the above copyright notice appear in all copies and that both that
-      copyright notice and this permission notice appear in supporting
-      documentation.  No representations are made about the suitability of this
-      software for any purpose.  It is provided "as is" without express or
-      implied warranty.
-
-
-GNOME Screensaver
-      Copyright (C) 2004-2008 William Jon McCann <mccann at jhu.edu>
-
-      This program 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.
-
-Floater saver
-      Copyright (C) 2005 Ray Strode <rstrode at redhat.com>,
-      Copyright (C) 2005 Matthias Clasen <mclasen at redhat.com>,
-      Copyright (C) 2005 Søren Sandmann <sandmann at redhat.com>
-
-      This program 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.
-
-GNOME Screensaver Theme Window
-      Copyright (C) 2005 Ray Strode <rstrode at redhat.com>
-
-      This program 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.
-
-The translations into Dutch, Finnish, French, Japanese, Lithuanian, Brazilian
-Portuguese, Slovak, Swedish, Thai, Ukrainian and traditional Chinese are
-copyrighted by the Free Software Foundation, Inc.
-
-The Vietnamese translation is copyrighted by the GNOME i18n Project for
-Vietnamese.
-
-The Hungarian translation is copyrighted by Canonical Ltd. and Rosetta
-Contributors 2005.
-
-They are all licensed under the GNU General Public License as published by the
-Free Software Foundation, either version 2 or any later version.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-
-On Debian Systems, the full text of the license can be found on
-/usr/share/common-licenses/GPL-2
-
-Some files are licensed under the following terms:
-
-   This program 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, or (at your option) any later version.
-
-   This program 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.
-
-On Debian Systems, the full text of the license can be found on
-/usr/share/common-licenses/LGPL-2
-
-
-savers/xdg-user-dir-lookup.[ch] are licensed under the following terms:
-
-  Copyright (c) 2007 Red Hat, inc
-
-  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.
+Files: *
+Copyright: 1991-2004 Jamie Zawinski <jwz at jwz.org>
+           2004-2009 William Jon McCann <mccann at jhu.edu>
+           2008-2011 Red Hat, Inc.
+           2006 Ray Strode <rstrode at redhat.com>
+           2003 Bill Nottingham <notting at redhat.com>
+License: GPL-2.0+
+ 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 program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in "/usr/share/common-licenses/GPL-2".




More information about the pkg-gnome-commits mailing list