Merge branch 'master' into pedigree

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

diff --git a/debian/copyright b/debian/copyright
index 3cee716ba9891763fd7dac6bf788e7ace8bc597b..d25e0861ac759779bd78126408ca79d1770a953d 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -80,7 +80,7 @@ Files: polygen.pm, pagestats.pm
 Copyright: © 2006 Enrico Zini
 License: GPL-2+
 
-Files: plugins/rst, plugins/proxy.py
+Files: plugins/rst, plugins/proxy.py, plugins/pythondemo
 Copyright: © martin f. krafft <madduck@madduck.net>
 License: GPL-2
 
@@ -88,6 +88,18 @@ Files: calendar.pm
 Copyright: (c) 2006, 2007 Manoj Srivastava <srivasta@debian.org>
 License: GPL-2+
 
+Files: hnb.pm
+Copyright: Copyright (C) 2008 Axel Beckert <abe@deuxchevaux.org>
+License: GPL-2+
+
+Files: creole.pm
+Copyright: Copyright (C) 2008 Bernd Zeimetz <bernd@bzed.de>
+License: GPL-2+
+
+Files: txt.pm
+Copyright: Copyright (C) 2008 Gabriel McManus <gmcmanus@gmail.com>
+License: GPL-2+
+
 Files: doc/logo/*
 Copyright: © 2006 Recai Oktaş <roktas@debian.org>
 License: GPL-2+