aboutsummaryrefslogtreecommitdiff
path: root/debian/copyright
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-03-18 14:38:20 -0400
committerJoey Hess <joey@kitenet.net>2012-03-18 14:38:20 -0400
commit223c6d487ae05e50998f2cd50997befa5eafb321 (patch)
tree689554c4dbf326f8afbd6cdee624441e5de66a8b /debian/copyright
parentd134a2a6e93bbb26664b027a10d98ac996a63cfc (diff)
downloadikiwiki-223c6d487ae05e50998f2cd50997befa5eafb321.tar
ikiwiki-223c6d487ae05e50998f2cd50997befa5eafb321.tar.gz
more updates for trail merge
Diffstat (limited to 'debian/copyright')
-rw-r--r--debian/copyright4
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/copyright b/debian/copyright
index 8fddb682b..ee52c0eda 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -157,6 +157,10 @@ Files: IkiWiki/Plugin/osm.pm
Copyright: © 2011 Blars Blarson, Antoine Beaupré
License: GPL-2
+Files: IkiWiki/Plugin/trail.pm
+Copyright: 2009-2012 Simon McVittie <http://smcv.pseudorandom.co.uk/>
+License: GPL-2+
+
Files: doc/logo/*
Copyright: © 2006 Recai Oktaş <roktas@debian.org>
License: GPL-2+