Convert copyright file to new format.

3 files changed, 52 insertions, 23 deletions

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 62b62549..6be25f9d 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -2,7 +2,7 @@
 #
 # Library functions for debhelper programs, perl version.
 #
-# Joey Hess, GPL copyright 1997-2000.
+# Joey Hess, GPL copyright 1997-2008.
 
 package Debian::Debhelper::Dh_Lib;
 use strict;
diff --git a/debian/changelog b/debian/changelog
index 355ad125..b1870869 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (7.0.5) UNRELEASED; urgency=low
+
+  * Convert copyright file to new format.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 30 Apr 2008 18:19:13 -0400
+
 debhelper (7.0.4) unstable; urgency=low
 
   * Fix underescaped $ in Makefile. Closes: #478475
diff --git a/debian/copyright b/debian/copyright
index ca856872..c539e098 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,29 +1,52 @@
-Debhelper is written by and copyright 1997-2006 Joey Hess <joeyh@debian.org>.
+Files: *
+Copyright: 1997-2008 Joey Hess <joeyh@debian.org>
+License: GPL-2+
+  The full text of the GPL is distributed as in
+  /usr/share/common-licenses/GPL-2 on Debian systems.
 
-Increasingly miniscule parts of the code (and certainly my inspiration for the
-whole thing) came from debmake, by Christoph Lameter <clameter@debian.org>.
+Files: examples/*, autoscripts/*
+Copyright: 1997-2008 Joey Hess <joeyh@debian.org>
+Licence: other
+ These files are in are in the public domain.
+ .
+ Pedants who belive I cannot legally say that code I have written is in
+ the public domain may consider them instead to be licensed as follows:
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted under any circumstances. No warranty.
 
-dh_perl is by Brendan O'Dea <bod@debian.org>.
-dh_python is by Josselin Mouette <josselin.mouette@ens-lyon.org>.
-dh_installcatalogs is by Adam Di Carlo <aph@debian.org>.
-dh_scrollkeeper is by Ross Burton <ross@burtonini.com>.
-dh_usrlocal is by Andrew Stribblehill <ads@debian.org>.
-dh_installlogcheck is by Jon Middleton <jjm@debian.org>.
-dh_installudev is by Marco d'Itri <md@Linux.IT>.
-dh_lintian is by Steve Robbins <smr@debian.org>.
+Files: dh_perl
+Copyright: Brendan O'Dea <bod@debian.org>
+License: GPL-2+
 
-Some of the dh_md5sums command is from a program by Charles
-Briscoe-Smith <cpb4@ukc.ac.uk>.
+Files: dh_python
+Copyright: Josselin Mouette <josselin.mouette@ens-lyon.org>
+License: GPL-2+
 
-The Spanish man pages are by Rubén Porras Campo <nahoo@inicia.es> and
-Rudy Godoy <rudy@kernel-panik.org>.
+Files: dh_installcatalogs
+Copyright: Adam Di Carlo <aph@debian.org>
+License: GPL-2+
 
-The copyright of this package is GPL, version 2 or later. Files in the
-examples/ directory are in the public domain[1]. On Debian systems the
-complete text of the GPL is in /usr/share/common-licenses/GPL
+Files: dh_scrollkeeper
+Copyright: Ross Burton <ross@burtonini.com>
+License: GPL-2+
 
-[1] Pedants who belive I cannot legally say that code I have written is in
-    the public domain may consider them instead to be licensed as follows:
+Files: dh_usrlocal
+Copyright: Andrew Stribblehill <ads@debian.org>
+License: GPL-2+
 
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted under any circumstances. No warranty.
+Files: dh_installlogcheck
+Copyright: Jon Middleton <jjm@debian.org>
+License: GPL-2+
+
+Files: dh_installudev
+Copyright: Marco d'Itri <md@Linux.IT>
+License: GPL-2+
+
+Files: dh_lintian
+Copyright: Steve Robbins <smr@debian.org>
+License: GPL-2+
+
+Files: dh_md5sums
+Copyright: Charles Briscoe-Smith <cpb4@ukc.ac.uk>
+License: GPL-2+