[SCM] Debian packaging of libnet-netmask-perl branch, master, updated. be4cc78041692cb8395a1b98edc39396f101ac87

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit e5af1c25e711dc8be701df83bb85dd568d5e1133
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Mar 25 15:00:07 2012 +0200

    Update copyright file: Rewrite using machine-readable format 1.0.

diff --git a/debian/copyright b/debian/copyright
index 9d73f28..ba8ebd5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,37 +1,45 @@
-Format-Specification: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=135
-Maintainer: David Muir Sharnoff <muir at idiom.org>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Net::Netmask
+Upstream-Contact: David Muir Sharnoff <muir at idiom.org>
 Source: http://search.cpan.org/dist/Net-Netmask/
-Name: Net-Netmask
 
 Files: *
 Copyright: 1998-2006, David Muir Sharnoff <muir at idiom.org>
- 2011, Google Inc
+  2011, Google, Inc.
 License: Artistic or GPL-1+
+ This module may be used, modified and redistributed on the same terms
+ as Perl itself.
+Comment:
+ Perl is licensed under either the 'Artistic License' or the 'GNU
+ General Public License' version 1 or later.
 
-Files: debian/*
-Copyright: 2000-2008, Jonas Smedegaard <dr at jones.dk>
-License: GPL-2
+Files: debian/rules
+Copyright: 2000-2008, 2012, Jonas Smedegaard <dr at jones.dk>
+License: 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'.
+Comment:
+ On Debian systems the 'Artistic License' is located 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'.
+Comment:
+ On Debian systems the 'GNU General Public License' version 1 is located
+ 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; version 2 dated June, 1991.
+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, or (at your option) any
+ later version.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+Comment:
+ On Debian systems the 'GNU General Public License' version 2 is located
+ in '/usr/share/common-licenses/GPL-2'.
  .
- On Debian systems, the complete text of the Artistic License can be
- found in `/usr/share/common-licenses/GPL-2'.
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.

-- 
Debian packaging of libnet-netmask-perl