[SCM] Packaging of String::Similarity in Debian branch, master, updated. upstream/1.04-2-g45aa830

[Fabrizio Regalli]

The following commit has been merged in the master branch:
commit 45aa830de3358ed361b9cb4755c0ae4f8f34f357
Author: Fabrizio Regalli <fabreg at fabreg.it>
Date:   Tue Mar 6 19:14:31 2012 +0100

    Removed GPL-1+ or Artistic License

diff --git a/debian/copyright b/debian/copyright
index bc339c3..d6a578d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,12 +4,21 @@ Source: http://search.cpan.org/dist/String-Similarity/
 Upstream-Name: String-Similarity
 
 Files: *
-Copyright: Marc Lehmann <schmorp at schmorp.de>
+Copyright: 2000, Marc Lehmann <schmorp at schmorp.de>
+License: GPL-2+
+
+Files: fstrcmp.c
+Copyright: 1995, Peter Miller <pmiller at agso.gov.au>
+	   1995, Marc Lehmann <schmorp at schmorp.de>
+License: GPL-2+
+
+Files: fstrcmp.h
+Copyright: 1995, Peter Miller <pmiller at agso.gov.au>
 License: GPL-2+
 
 Files: debian/*
 Copyright: 2012, Fabrizio Regalli <fabreg at fabreg.it>
-License: GPL-2+ or Artistic or GPL-1+
+License: GPL-2+
 
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
@@ -19,19 +28,3 @@ License: GPL-2+
  .
  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'.
-
-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 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 systems, the complete text of version 1 of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-1'.

-- 
Packaging of String::Similarity in Debian