[SCM] Debian packaging of libxml-sax-perl branch, master, updated. upstream/0.99-141-g00204b8

[Florian Schlichting]

The following commit has been merged in the master branch:
commit 8e8a561ebae8b106ffcd55612af5cc59baa6a525
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Sat Sep 10 23:15:56 2011 +0000

    Refresh d/copyright

diff --git a/debian/changelog b/debian/changelog
index 6c9089c..facac2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libxml-sax-perl (0.99+dfsg-1) UNRELEASED; urgency=low
   * Update d/watch.
   * Switch to source format "3.0 (quilt)".
   * Bump compatibility level to 8.
+  * Refresh d/copyright.
 
   [ Ansgar Burchardt ]
   * Update my email address.
diff --git a/debian/copyright b/debian/copyright
index 7e7cccf..ba09331 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,9 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Grant McLean, grantm at cpan.org
-Upstream-Source: http://search.cpan.org/dist/XML-SAX/
-Upstream-Name: XML-SAX
-
-X-Repackaging-Reasoning:
-  Upstream sources are repackaged to remove several files with unclear
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Grant McLean, grantm at cpan.org
+Source: http://search.cpan.org/dist/XML-SAX/
+Name: XML-SAX
+Comment:
+  Upstream sources are repackaged to remove a file with non-free
   licensing/copyright:
     + testcases/xmltest.xml  (See #452872)
   Repackaging is done via debian/repack.stub and can be replayed using either
@@ -14,7 +12,7 @@ X-Repackaging-Reasoning:
 Files: *
 Copyright: Matt Sergeant, matt at sergeant.org
 License-Alias: Perl
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 Files: 
  XML/SAX/*.pm
@@ -25,18 +23,18 @@ Files:
  XML/SAX/Reader/String.pm
  XML/SAX/Reader/UnicodeExt.pm
 Copyright: Grant McLean, grantm at cpan.org
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 Files: XML/SAX/DocumentLocator.pm
 Copyright: Matt Sergeant, matt at sergeant.org
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 Files: XML-SAX-Base/Makefile.PL
 Copyright:
  Kip Hampton <khampton at totalcinema.com>
  Robin Berjon <robin at knowscape.com>
  Matt Sergeant <matt at sergeant.org>
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 Files: debian/*
 Copyright: 
@@ -48,18 +46,21 @@ Copyright:
  2009, gregor herrmann <gregoa at debian.org>
  2009, Franck Joncourt
  2009, Antonio Radici <antonio at dyne.org>
-License: Artistic | GPL-1+
+ 2011, Florian Schlichting <fschlich at zedat.fu-berlin.de>
+License: Artistic or GPL-1+
 
 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'
+ 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 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'
+ 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 systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.

-- 
Debian packaging of libxml-sax-perl