r34315 - in /desktop/unstable/file-roller/debian: changelog copyright

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Apr 17 19:51:52 2012
New Revision: 34315

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

Modified:
    desktop/unstable/file-roller/debian/changelog
    desktop/unstable/file-roller/debian/copyright

Modified: desktop/unstable/file-roller/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/changelog?rev=34315&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/changelog [utf-8] (original)
+++ desktop/unstable/file-roller/debian/changelog [utf-8] Tue Apr 17 19:51:52 2012
@@ -1,8 +1,9 @@
 file-roller (3.4.1-1) UNRELEASED; urgency=low
 
   * New upstream translation release.
-
- -- Michael Biebl <biebl at debian.org>  Tue, 17 Apr 2012 21:39:41 +0200
+  * Update debian/copyright using the machine-readable copyright format 1.0.
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 17 Apr 2012 21:50:32 +0200
 
 file-roller (3.4.0-1) unstable; urgency=low
 

Modified: desktop/unstable/file-roller/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/copyright?rev=34315&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/copyright [utf-8] (original)
+++ desktop/unstable/file-roller/debian/copyright [utf-8] Tue Apr 17 19:51:52 2012
@@ -1,30 +1,53 @@
-This package was debianized by Bastien Nocera <hadess at hadess.net> on
-Wed, 19 Dec 2001 17:15:09 +0000.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: file-roller
+Source: http://ftp.gnome.org/pub/GNOME/sources/file-roller/
 
-It was downloaded from http://ftp.gnome.org/pub/gnome/sources/file-roller/
+Files: *
+Copyright: 2001, 2003-2008 Free Software Foundation, Inc.
+License: GPL-2.0+
 
-Upstream Author: Paolo Bacchilega <paolo.bacch at tin.it>
+Files: copy-n-paste/*
+Copyright: 2007 Novell, Inc.
+License: LGPL-2.0+
 
-Copyright notice:
+Files: src/egg*
+Copyright: 2007 Mathias Hasselmann
+           2001 Ben Tea Spoons, Inc.
+           2005 Free Software Foundation, Inc.
+           2001 Red Hat, Inc.
+License: LGPL-2.0+
 
-    Copyright (C) 2001-2007 Free Software Foundation, Inc.
+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".
 
-License:
+License: LGPL-2.0+
+ 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".
 
-    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
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-