[libcache-perl] 19/28: modernise debian/copyright

[dom at earth.li]

This is an automated email from the git hooks/post-receive script.

dom pushed a commit to branch master
in repository libcache-perl.

commit 5160c0cfc1c2f9f9720e6f5389050d8f1208d3d5
Author: Dominic Hargreaves <dom at earth.li>
Date:   Sun Feb 2 16:05:41 2014 +0000

    modernise debian/copyright
---
 debian/changelog |  1 +
 debian/copyright | 49 +++++++++++++++++++++++++++++++++++++------------
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f53f158..f9e0764 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libcache-perl (2.08-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Use machine-readable debian/copyright
 
  -- Dominic Hargreaves <dom at earth.li>  Sun, 02 Feb 2014 15:42:04 +0000
 
diff --git a/debian/copyright b/debian/copyright
index 294ca52..c057fd5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,41 @@
-This is the debian package for the Cache module.
-It was created by Dominic Hargreaves <dom at earth.li> using dh-make-perl.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://metacpan.org/release/Cache
+Upstream-Contact: Shlomi Fish <shlomif at shlomifish.org>
+Upstream-Name: Cache
 
-The software was downloaded from CPAN <http://search.cpan.org/dist/Cache/>
+Files: *
+Copyright: 2003-2006 Chris Leishman
+License: Artistic or GPL-1+
 
-Cache is Copyright (C) 2003-2006 Chris Leishman.  All Rights Reserved.
+Files: inc/Devel/*
+Copyright: 2007-2012 David Cantrell
+License: Artistic or GPL-2+
 
-The upstream author is: 
-Chris Leishman <chris at leishman.org>
- Based on work by DeWitt Clinton <dewitt at unto.net>.
-Cache is dual licensed under the same terms as Perl itself.
+Files: debian/*
+Copyright: 2005-2014, Dominic Hargreaves <dom at earth.li>
+License: Artistic or GPL-1+
 
-Perl is distributed under your choice of the GNU General Public License or
-the Artistic License.  On Debian GNU/Linux systems, the complete text of the
-GNU General Public License can be found in `/usr/share/common-licenses/GPL'
-and the Artistic Licence in `/usr/share/common-licenses/Artistic'.
+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'.
+
+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.
+ .
+ On Debian systems, the complete text of version 21 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libcache-perl.git