[SCM] Debian packaging of libsearch-xapian-perl branch, master, updated. 50e0187aeddd157d5934c9c70ce3f7f77e6e1cc8

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit 2def06ad99fe2424ff946a7e20c1a3afd7dc0234
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Thu Aug 11 14:28:30 2011 +0200

    debian/copyright: Add additional copyright holder; update formatting.

diff --git a/debian/copyright b/debian/copyright
index 0d2bdca..24a6fc7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,17 +1,18 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Olly Betts <olly at survex.com>
-Upstream-Source: http://search.cpan.org/dist/Search-Xapian/
-Upstream-Name: Search-Xapian
+Format-Specification: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=135
+Maintainer: Olly Betts <olly at survex.com>
+Source: http://search.cpan.org/dist/Search-Xapian/
+Name: Search-Xapian
 
 Files: *
-Copyright: 2002,2003 Alex Bowley <kilinrax at cpan.org>
+Copyright:
+ 2002,2003, Alex Bowley <kilinrax at cpan.org>
  2003,2004,2005,2006,2007,2008,2009,2010,2011, Olly Betts <olly at survex.com>
-License-Alias: Perl
-License: Artistic | GPL-1+
+ 2010, Adam Sjøgren
+License: Artistic or GPL-1+
 
 Files: examples/simple*
-Copyright: 2003, James Aylett <james at tartarus.org>
+Copyright:
+ 2003, James Aylett <james at tartarus.org>
  2004,2006,2007,2009, Olly Betts <olly at survex.com>
 License: GPL-2+
 
@@ -20,7 +21,8 @@ Copyright: 2009, Olly Betts <olly at survex.com>
 License: GPL-2+
 
 Files: debian/*
-Copyright: 2009, Jonathan Yu <jawnsy at cpan.org>
+Copyright:
+ 2009, Jonathan Yu <jawnsy at cpan.org>
  2009, Ryan Niebur <ryan at debian.org>
  2009, Xavier Oswald <xoswald at debian.org>
  2008, Jose Luis Rivas <ghostbar38 at gmail.com>
@@ -29,27 +31,29 @@ Copyright: 2009, Jonathan Yu <jawnsy at cpan.org>
  2006-2008, Frank Lichtenheld <djpig at debian.org>
  2007, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
  2009,2010,2011,2011, Olly Betts <olly at survex.com>
-License: Artistic | GPL-1+
+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'.
 
 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 as
-    published by the Free Software Foundation; either version 2 of the
-    License, or (at your option) any later version.
-    On Debian GNU/Linux systems, the complete text of the GNU General
-    Public License version 2 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 as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+ .
+ On Debian systems, the complete text of version 2 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.

-- 
Debian packaging of libsearch-xapian-perl