[SCM] Debian packaging for latexdiff branch, master, updated. debian/0.5-2-22-g29c1206

[gregor herrmann]

The following commit has been merged in the master branch:
commit 16b90f0de2bd536cab4a5c0379c6d8a1a26dfdf7
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Apr 1 16:26:27 2012 +0200

    debian/copyright: update to Copyright-Format 1.0.

diff --git a/debian/copyright b/debian/copyright
index 16658be..4d084f0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format-Specification: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=59
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: http://bullard.esc.cam.ac.uk/~tilmann/soft.html
 
 Files: *
@@ -11,15 +11,12 @@ License: GPL-2
 
 Files: latexdiff-so latexdiff-fast (inlined Algorithm::Diff)
 Copyright: ©  2000-2002 Ned Konz.  All rights reserved.
-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.
+License: Artistic or GPL-1+
 
 Files: debian/*
 Copyright: © 2008, Pietro Abate <pietro.abate at pps.jussieu.fr>
-	   © 2009, David Bremner <bremner at unb.ca>
-License: same as upstream
+    © 2009, David Bremner <bremner at unb.ca>
+License: GPL-2
 
 Files: debian/latexdiff-man.tex debian/Makefile.manual
 Copyright: © 2004-2009 Frederik Tilmann <tillman at esc.cam.au.uk>
@@ -28,9 +25,9 @@ License: GPL-2
     Subject: Re: latexdiff-man.pdf
     From: Frederik Tilmann <fjt21 at cam.ac.uk>
     Date: Wed, 12 Aug 2009 03:23:03 +0100
-
+ .
     Hi David
-
+ .
     thanks for taking on the packaging for Debian. Mostly, the
     documentation is in pod format and already in the distribution (within
     latexdiff and latexrevise, and latexdiff-vc), but there is a separate
@@ -39,25 +36,19 @@ License: GPL-2
     distribution (in directory dist) and I attach latexdiff-man.tex. All
     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
     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.
-
+ .
     Regards
     Frederik
 
-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.
-    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
     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'
 
@@ -66,6 +57,15 @@ License: GPL-1+
     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'
 
+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.
+ .
+    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'.
+

-- 
Debian packaging for latexdiff