update copyright format to DEP-5

1 files changed, 61 insertions, 53 deletions

diff --git a/debian/copyright b/debian/copyright
index 300dd110b..799a354c4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,19 +1,20 @@
+Format: http://dep.debian.net/deps/dep5/
+Source: native package
+
 Files: *
-Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info>
+Copyright: © 2006-2011 Joey Hess <joey@ikiwiki.info>
 License: GPL-2+
- The full text of the GPL is distributed as doc/GPL in ikiwiki's source,
- and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems.
 
-Files: templates/*, underlays/basewiki/*, doc/ikiwiki/directive/*, ikiwiki.setup, po/underlay/*
+Files: templates/* underlays/basewiki/* doc/ikiwiki/directive/*
+ ikiwiki.setup po/underlay/*
 Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info>
 License: other
  Redistribution and use in source and compiled forms, with or without
  modification, are permitted under any circumstances. No warranty.
 
 Files: bzr.pm
-Copyright:
- © 2008 Jelmer Vernooij <jelmer@samba.org>
- © 2006 Emanuele Aina
+Copyright: © 2008 Jelmer Vernooij <jelmer@samba.org>
+           © 2006 Emanuele Aina
 License: GPL-2+
 
 Files: git.pm
@@ -24,7 +25,7 @@ Files: mercurial.pm
 Copyright: © 2006 Emanuele Aina
 License: GPL-2+
 
-Files: monotone.pm, listdirectives.pm, progress.pm
+Files: monotone.pm listdirectives.pm progress.pm
 Copyright: © 2007, 2008 William Uther
 License: GPL-2+
 
@@ -33,13 +34,12 @@ Copyright: © 2006 Clint Adams <schizo@debian.org>
 License: GPL-2+
 
 Files: darcs.pm
-Copyright:
- © 2006  Thomas Schwinge <tschwinge@gnu.org>
-   2007  Benjamin A'Lee <bma@bmalee.eu>
-         Tuomo Valkonen <tuomov@iki.fi>
-   2008  Simon Michael <simon@joyful.com>
-         Petr Ročkai <me@mornfall.net>
-         Sven M. Hallberg <pesco@khjk.org>
+Copyright: © 2006  Thomas Schwinge <tschwinge@gnu.org>
+           2007  Benjamin A'Lee <bma@bmalee.eu>
+           Tuomo Valkonen <tuomov@iki.fi>
+           2008  Simon Michael <simon@joyful.com>
+           Petr Ročkai <me@mornfall.net>
+           Sven M. Hallberg <pesco@khjk.org>
 License: GPL-2+
 
 Files: teximg.pm
@@ -86,15 +86,15 @@ Files: htmltidy.pm
 Copyright: © 2006 Faidon Liambotis
 License: GPL-2+
 
-Files: htmlbalance.pm, underlay.pm
+Files: htmlbalance.pm underlay.pm
 Copyright: © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
 License: GPL-2+
 
-Files: polygen.pm, pagestats.pm, cutpaste.pm
+Files: polygen.pm pagestats.pm cutpaste.pm
 Copyright: © 2006 Enrico Zini
 License: GPL-2+
 
-Files: plugins/rst, plugins/proxy.py, plugins/pythondemo
+Files: plugins/rst plugins/proxy.py plugins/pythondemo
 Copyright: © martin f. krafft <madduck@madduck.net>
 License: GPL-2
 
@@ -123,9 +123,8 @@ Copyright: Copyright (C) 2008 Peter Simons <simons@cryp.to>
 License: GPL-2+
 
 Files: comments.pm
-Copyright: 
- © 2006-2008 Joey Hess <joey@ikiwiki.info>
- © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
+Copyright: © 2006-2008 Joey Hess <joey@ikiwiki.info>
+           © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
 License: GPL-2+
 
 Files: po.pm
@@ -136,79 +135,79 @@ Files: 404.pm
 Copyright: © 2009 Simon McVittie <http://smcv.pseudorandom.co.uk/>
 License: GPL-2+
 
-Files: wmd.pm, getsource.pm
+Files: wmd.pm getsource.pm
 Copyright: © 2009 William Uther
 License: GPL-2+
 
 Files: rsync.pm
 Copyright: © 2009 Amitai Schlair
-License: BSD-C2
+License: BSD-2-clause
 
 Files: doc/logo/*
 Copyright: © 2006 Recai Oktaş <roktas@debian.org>
 License: GPL-2+
 
 Files: po/*
-Copyright:
-  2007 Damyan Ivanov <dam@modsodtsys.com>
-  2007-2009 Miroslav Kure <kurem@debian.cz>
-  2008 Jonas Smedegaard <dr@jones.dk>
-  2008 Kai Wasserbäch <debian@carbon-project.org>
-  2008-2009 Kurt Gramlich <kurt@skolelinux.de>
-  2007 Kartik Mistry <kartik.mistry@gmail.com>
-  2007 Pawel Tecza <ptecza@net.icm.edu.pl>
-  2007, 2009 Víctor Moral <victor@taquiones.net>
-  2007 Jean-Luc Coulon (f5ibh) <jean-luc.coulon@«anadoo.fr>
-  2008 Christian Perrier <bubulle@debian.org>
-  2007 Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
-  2007 Daniel Nylander <po@danielnylander.se>
-  2009 Fernando González de Requena <fgrequena@gmail.com>
-  2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
-License: 
+Copyright: 2007 Damyan Ivanov <dam@modsodtsys.com>
+           2007-2009 Miroslav Kure <kurem@debian.cz>
+           2008 Jonas Smedegaard <dr@jones.dk>
+           2008 Kai Wasserbäch <debian@carbon-project.org>
+           2008-2009 Kurt Gramlich <kurt@skolelinux.de>
+           2007 Kartik Mistry <kartik.mistry@gmail.com>
+           2007 Pawel Tecza <ptecza@net.icm.edu.pl>
+           2007, 2009 Víctor Moral <victor@taquiones.net>
+           2007 Jean-Luc Coulon (f5ibh) <jean-luc.coulon@«anadoo.fr>
+           2008 Christian Perrier <bubulle@debian.org>
+           2007 Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
+           2007 Daniel Nylander <po@danielnylander.se>
+           2009 Fernando González de Requena <fgrequena@gmail.com>
+           2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+License: other
  Redistribution and use in source and compiled forms, with or without
  modification, are permitted under any circumstances. No warranty.
 
 Files: doc/smileys/*
-Copyright:
- (c) 2000 - 2004 by Jürgen Hermann <jh@web.de>
- (c) 1999, 2000 Martin Pool <mbp@humbug.org.au>
+Copyright: (c) 2000 - 2004 by Jürgen Hermann <jh@web.de>
+           (c) 1999, 2000 Martin Pool <mbp@humbug.org.au>
 License: GPL-2+
  Smileys were copied from Moin Moin.
 
 Files: doc/smileys/neutral.png
-	doc/smileys/question.pn
+ doc/smileys/question.pn
 Copyright: (c) 2002 phpBB Group
 License: GPL-2
  These smileys were copied from phpBB.
 
 Files: doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn
 Copyright: © 2007 Joey Hess <joeyh@ikiwiki.info>, LinuxWorld.com
-License: GPL-2+
+Comment: 
  First published on LinuxWorld.com, a publication of Network World Inc.,
  118 Turnpike Rd., Southboro, MA 01772.
  .
  Republished with permission.
+License: GPL-2+
 
 Files: cvs.pm
 Copyright: © 2009 Amitai Schlair
-License: BSD-C2
+License: BSD-2-clause
 
 Files: underlays/openid-selector/ikiwiki/openid/*
 Copyright: © 2008-2010 andyjm, david.j.boden
-License: BSD-C2
-  From http://code.google.com/p/openid-selector/
+Comment: 
+ From http://code.google.com/p/openid-selector/
+License: BSD-2-clause
 
 Files: underlays/openid-selector/ikiwiki/openid/jquery.js
 Copyright: © 2005-2008 by John Resig, Branden Aaron & Jörn Zaefferer
 License: GPL-2
 
 Files: underlays/themes/blueview/style.css
-Copyright: 
- © 2009,2010 Bernd Zeimetz
- © 2008 Yahoo! Inc.
+Copyright: © 2009,2010 Bernd Zeimetz
+           © 2008 Yahoo! Inc.
+Comment:
+ Parts derived from BSD-3-clause licensed YUI library.
+ http://developer.yahoo.com/yui/license.html
 License: GPL-2+
-  Parts derived from BSD-C3 licensed YUI library.
-  http://developer.yahoo.com/yui/license.html
 
 Files: underlays/themes/blueview/*
 Copyright: © 2009,2010 Bernd Zeimetz
@@ -218,7 +217,7 @@ Files: underlays/themes/goldtype/*
 Copyright: © Lars Wirzenius
 License: GPL-2+
 
-License: BSD-C2
+License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -240,3 +239,12 @@ License: BSD-C2
  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
+
+License: GPL-2
+ The full text of the GPL is distributed as doc/GPL in ikiwiki'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 doc/GPL in ikiwiki's source,
+ and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems.
+