summaryrefslogtreecommitdiff
path: root/debian/copyright
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2008-12-30 18:24:36 +0100
committerintrigeri <intrigeri@boum.org>2008-12-30 18:24:36 +0100
commit21add7ffa87a5e622d18bdbb24c638c15bdb3800 (patch)
tree6780aa6dbee71f18db64e44b012e789fc8197d4b /debian/copyright
parent3190e5cea75a43d38f58b8a45fbc87d5527d18f0 (diff)
parent3032909090711c86c5056987043eeff5a1f6aec2 (diff)
Merge commit 'upstream/master' into prv/po
Conflicts: debian/control debian/copyright doc/ikiwiki/pagespec.mdwn Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'debian/copyright')
-rw-r--r--debian/copyright12
1 files changed, 11 insertions, 1 deletions
diff --git a/debian/copyright b/debian/copyright
index fe5db8af8..1f189f314 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -76,6 +76,10 @@ Files: htmltidy.pm
Copyright: © 2006 Faidon Liambotis
License: GPL-2+
+Files: htmlbalance.pm
+Copyright: © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
+License: GPL-2+
+
Files: polygen.pm, pagestats.pm, cutpaste.pm
Copyright: © 2006 Enrico Zini
License: GPL-2+
@@ -108,8 +112,14 @@ Files: google.pm
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/>
+License: GPL-2+
+
Files: po.pm
-Copyright: (C) 2008 intrigeri <intrigeri@boum.org>
+Copyright: © 2008 intrigeri <intrigeri@boum.org>
License: GPL-2+
Files: doc/logo/*