[SCM] Debian packaging for latexdiff branch, master, updated. debian/0.5-1-4-g3c89219

[gregor herrmann]

The following commit has been merged in the master branch:
commit 3c892196e45c3be8bffe23cb9c89f064f5b18072
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Aug 16 18:05:43 2009 +0200

    some reformatting in debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 681021a..5225fe4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,32 +4,17 @@ Source: http://bullard.esc.cam.ac.uk/~tilmann/soft.html
 Files: *
 Copyright: © 2004-2008 Frederik Tilmann <tillman at esc.cam.au.uk>
 License: GPL-2
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License Version 2 as published by
-    the Free Software Foundation.
-
-    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 General Public License for more details (file LICENSE in the
-    distribution).
 
 Files: contrib/latexdiff-wrap
 Copyright: © 2005-2006 Volker Kuhlmann <VolkerKuhlmann at gmx.de>
 License: GPL-2
-    Released under the terms of the GNU General Public License (GPL) Version 2.
-    See http://www.gnu.org/ for details.
-
-    Volker Kuhlmann
-      5, 6, 7, 12, 16, 17 Oct 2005
-      31 Jan; 5, 7, 13, 15 Feb 2006
 
 Files: latexdiff-so latexdiff-fast (inlined Algorithm::Diff)
 Copyright: ©  2000-2002 Ned Konz.  All rights reserved.
-License: Perl	   
-    This program is free software;
-    you can redistribute it and/or modify it under the same terms
-    as Perl itself.
+License-Alias: Perl
+License: Artistic | GPL-1+
+ This program is free software; you can redistribute it and/or modify it
+ under the same terms as Perl itself.
 
 Files: debian/*
 Copyright: © 2008, Pietro Abate <pietro.abate at pps.jussieu.fr>
@@ -55,7 +40,7 @@ To: David Bremner <bremner-dated-1251220141.24d29f at pivot.cs.unb.ca>
     the other files needed should be in the distribution (but the paths
     will need adapting).
 
-     I note your comments regarding version numbering, and also will see
+    I note your comments regarding version numbering, and also will see
     that I include the latexdiff-man.tex file in the next release on CTAN
     but I have been rather busy of late, so the next release is not
     imminent.
@@ -63,18 +48,24 @@ To: David Bremner <bremner-dated-1251220141.24d29f at pivot.cs.unb.ca>
     Regards
     Frederik
 
-License-Alias: Perl
-License: Artistic | GPL-1+
-
-License: GPL-1+
- On Debian systems, the complete text of the GNU General Public
- License can be found in `/usr/share/common-licenses/GPL'.
-
 License: GPL-2
- On Debian systems, the complete text of the version 2 of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
+    This program is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License Version 2 as published
+    by the Free Software Foundation.
+    On Debian systems, the complete text of the version 2 of the GNU General
+    Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 License: Artistic
- On Debian systems, the complete text of the Artistic License can be
- found in `/usr/share/common-licenses/Artistic.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the Artistic License, which comes with Perl.
+    On Debian GNU/Linux systems, the complete text of the Artistic License
+    can be found in `/usr/share/common-licenses/Artistic'
+
+License: GPL-1+
+    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 1, or (at your option)
+    any later version.
+    On Debian GNU/Linux systems, the complete text of the GNU General
+    Public License can be found in `/usr/share/common-licenses/GPL'
 

-- 
Debian packaging for latexdiff