r33264 - in /desktop/experimental/gcalctool/debian: changelog copyright

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Mar 16 17:07:13 2012
New Revision: 33264

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

Modified:
    desktop/experimental/gcalctool/debian/changelog
    desktop/experimental/gcalctool/debian/copyright

Modified: desktop/experimental/gcalctool/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gcalctool/debian/changelog?rev=33264&op=diff
==============================================================================
--- desktop/experimental/gcalctool/debian/changelog [utf-8] (original)
+++ desktop/experimental/gcalctool/debian/changelog [utf-8] Fri Mar 16 17:07:13 2012
@@ -9,8 +9,9 @@
   * debian/rules:
     - Remove obsolete --disable-scrollkeeper configure flag.
     - Use --disable-schemas-compile since we have triggers for that.
-
- -- Michael Biebl <biebl at debian.org>  Fri, 16 Mar 2012 17:59:40 +0100
+  * Update debian/copyright using the machine-readable copyright format 1.0.
+
+ -- Michael Biebl <biebl at debian.org>  Fri, 16 Mar 2012 18:06:37 +0100
 
 gcalctool (6.2.0-1) unstable; urgency=low
 

Modified: desktop/experimental/gcalctool/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gcalctool/debian/copyright?rev=33264&op=diff
==============================================================================
--- desktop/experimental/gcalctool/debian/copyright [utf-8] (original)
+++ desktop/experimental/gcalctool/debian/copyright [utf-8] Fri Mar 16 17:07:13 2012
@@ -1,50 +1,26 @@
-This package was debianized by Sebastien Bacher <seb128 at debian.org> on
-Thu, 17 Jul 2003 12:55:48 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: gcalctool
+Source: http://ftp.gnome.org/pub/GNOME/sources/gcalctool/
 
-It was debianized for the first time by Vincent Renardias <vincent at waw.com>.
+Files: *
+Copyright: 2008-2011 Robert Ancell
+           1987-2008 Sun Microsystems, Inc.
+           2004-2008 Sami Pietila
+License: GPL-2.0+
 
-It was downloaded from : http://ftp.gnome.org/pub/GNOME/sources/gcalctool/
-
-Upstream Author:
-	Rich Burridge <richburridge at users.sourceforge.net>
-	Sami Pietila <sampie at ariana-dsl.utu.fi>
-	Robert Ancell <robert.ancell at gmail.com>
-
-Copyright:
-    For everything not listed below (plus gcalctool/functions.c, 
-      gcalctool/gtk.c, gcalctool/display.c, gcalctool/display.hi,
-      gcalctool/ui.h)
-    Copyright (c) 1987-2009 Sun Microsystems, Inc.
-
-    for gcalctool/ce_parser.[chy],
-        gcalctool/ce_tokeniser.l,
-        gcalctool/functions.h,
-        gcalctool/parser.h,
-        gcalctool/parser_mac.h:
-    Copyright (C) 2004-2008 Sami Pietila
-
-    for gcalctool/display.[ch],
-        gcalctool/functions.[ch],
-        gcalctool/gtk.c,
-        gcalctool/register.[ch],
-        gcalctool/ui.h:
-    Copyright (c) 2008-2009 Robert Ancell
-
-License:
-
-    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 3 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
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-3'.
+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".