Merge branch 'master' into pedigree

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

diff --git a/debian/copyright b/debian/copyright
index ab85fe424588757abb5922973c45eb042e1db552..d25e0861ac759779bd78126408ca79d1770a953d 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,21 @@
 Files: *
 Files: *

-Copyright: © 2006-2007 Joey Hess <joey@ikiwiki.info>
+Copyright: © 2006-2008 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.
 
 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/*
-Copyright: © 2006-2007 Joey Hess <joey@ikiwiki.info>
+Files: templates/*, underlays/basewiki/*, ikiwiki.setup
+Copyright: © 2006-2008 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.
 
 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
+License: GPL-2+
+

 Files: git.pm
 Copyright: © 2006-2007 Recai Oktaş <roktas@debian.org>
 License: GPL-2+
 Files: git.pm
 Copyright: © 2006-2007 Recai Oktaş <roktas@debian.org>
 License: GPL-2+


@@ -58,10 +64,6 @@ Files: topography.pm
 Copyright: © 2006 Recai Oktaş <roktas@debian.org>
 License: GPL-2+
 
 Copyright: © 2006 Recai Oktaş <roktas@debian.org>
 License: GPL-2+
 

-Files: rst.pm
-Copyright: © 2006 Sergio Talens-Oliag <sto@debian.org>
-License: GPL-2+
-

 Files: map.pm
 Copyright: © 2006 Alessandro Dotti Contra
 License: GPL-2+
 Files: map.pm
 Copyright: © 2006 Alessandro Dotti Contra
 License: GPL-2+


@@ -78,6 +80,26 @@ Files: polygen.pm, pagestats.pm
 Copyright: © 2006 Enrico Zini
 License: GPL-2+
 
 Copyright: © 2006 Enrico Zini
 License: GPL-2+
 

+Files: plugins/rst, plugins/proxy.py, plugins/pythondemo
+Copyright: © martin f. krafft <madduck@madduck.net>
+License: GPL-2
+
+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+
 Files: doc/logo/*
 Copyright: © 2006 Recai Oktaş <roktas@debian.org>
 License: GPL-2+