Merge commit 'upstream/master' into pub/po

[git.ikiwiki.info.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index c5993edb2b68195b8e7aa584ba508438e3ba5436..bcd2c1a474e89c41e5621f94d9923abf1df7c165 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -32,6 +32,16 @@ Files: tla.pm
 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>
+License: GPL-2+
+
 Files: teximg.pm
 Copyright: © 2007 Patrick Winnertz <patrick.winnertz@skolelinux.org>
 License: GPL-2+
@@ -76,7 +86,7 @@ Files: htmltidy.pm
 Copyright: © 2006 Faidon Liambotis
 License: GPL-2+
 
-Files: htmlbalance.pm
+Files: htmlbalance.pm, underlay.pm
 Copyright: © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
 License: GPL-2+
 
@@ -122,6 +132,14 @@ Files: po.pm
 Copyright: © 2008-2009 intrigeri <intrigeri@boum.org>
 License: GPL-2+
 
+Files: 404.pm
+Copyright: © 2009 Simon McVittie <http://smcv.pseudorandom.co.uk/>
+License: GPL-2+
+
+Files: wmd.pm
+Copyright: © 2009 William Uther
+License: GPL-2+
+
 Files: doc/logo/*
 Copyright: © 2006 Recai Oktaş <roktas@debian.org>
 License: GPL-2+