DEP-5

diff --git a/debian/copyright b/debian/copyright
index ebe3ee7ec744fe83881f691ad1f79ea4f71332f4..feccf509671bce5076edb6b286c713b0c131e5cb 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,22 +1,26 @@
-This package was put together and debianized by Joey Hess
-<joeyh@debian.org>, using sources from all over.
+Format: http://dep.debian.net/deps/dep5/
+Source: Contributed by many folks.
+
+Files: *
+Copyright: 2006-2011 Joey Hess <joeyh@debian.org>
+License: GPL-2+
 
 Files: isutf8.*
 Copyright: 2005 Lars Wirzenius
 License: GPL-2+
- The full text of the GPL is distributed as COPYING in moreutils's source,
- and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems.
 
 Files: sponge.*
 Copyright: 2006 Tollef Fog Heen
+Comment:
+ Name and concept by Colin Watson.
 License: GPL-2
-Note: Name and concept by Colin Watson.
 
 Files: ifdata.c
 Copyright: 2002 Benjamin BAYART
+Comment:
+ It was originally called ifcfg and has a web page at 
+ http://edgard.dyn.fdn.fr/developpements/ifcfg.shtml
 License: GPL-2+
-Note: It was originally called ifcfg and has a web page at 
-      http://edgard.dyn.fdn.fr/developpements/ifcfg.shtml
 
 Files: pee.c
 Copyright: 2006 Miek Gieben
@@ -30,12 +34,12 @@ Files: mispipe.c
 Copyright: 2004 Nathanael Nerode
 License: GPL-2+ | MIT
 
-Files: lckdo.c, lckdo.docbook
+Files: lckdo.c lckdo.docbook
 Copyright: Michael Tokarev
 License: other
  Public domain
 
-Files: ifne.c, ifne.docbook
+Files: ifne.c ifne.docbook
 Copyright: 2008 Javier Merino
 License: GPL-2+
 
@@ -47,6 +51,10 @@ Files: physmem.c
 Copyright: 2000, 2001, 2003, 2005, 2006 Free Software Foundation, Inc.
 License: GPL-2+
 
-Files: *
-Copyright: 2006-2008 Joey Hess <joeyh@debian.org>
 License: GPL-2+
+ The full text of the GPL is distributed as COPYING in moreutils's source,
+ and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems.
+
+License: GPL-2
+ The full text of the GPL is distributed as COPYING in moreutils's source,
+ and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems.