[SCM] Debian packaging of libnetaddr-ip-perl branch, master, updated. debian/4.048+dfsg-1-9-gedc0693

[gregor herrmann]

The following commit has been merged in the master branch:
commit 2ed3cad8fd3d0010fc6a399ddd2ee584b18b93c9
Author: gregor herrmann <gregoa at debian.org>
Date:   Thu Oct 20 19:42:54 2011 +0200

    debian/copyright: update upstream copyright years and licenses.

diff --git a/debian/copyright b/debian/copyright
index 242da06..a019633 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,8 +8,8 @@ X-Comment: The +dfsg version is created by removing the non-free RFC from
 Files: *
 Copyright:
  1999-2007, Luis E. Muñoz <luismunoz at cpan.org>
- 2006-2010, Michael Robinton <michael at bizsystems.com>
-License: Artistic
+ 2006-2011, Michael Robinton <michael at bizsystems.com>
+License: Artistic or GPL-2+
 
 Files: debian/*
 Copyright:
@@ -19,7 +19,14 @@ Copyright:
  2008-2011, gregor herrmann <gregoa at debian.org>
  2008, Damyan Ivanov <dmn at debian.org>
  2010-2011, Nicholas Bamber <nicholas at periapt.co.uk>
-License: GPL-1+ or Artistic
+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 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
@@ -30,9 +37,11 @@ License: GPL-1+
  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: Artistic
+License: GPL-2+
  This program is free software; you can redistribute it and/or modify
- it under the terms of the Artistic License, which comes with Perl.
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
  .
- On Debian systems, the complete text of the Artistic License can be
- found in `/usr/share/common-licenses/Artistic'.
+ 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 libnetaddr-ip-perl