Merge branch 'master' of ssh://git.ikiwiki.info

[ikiwiki.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 7dfeff13d9c0b0b66156c2535c54bbd5f21619fe..82c72d7340231985247a426f63d049b6424892e5 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,28 +12,29 @@ License: other
  Redistribution and use in source and compiled forms, with or without
  modification, are permitted under any circumstances. No warranty.
 
-Files: bzr.pm
+Files: IkiWiki/Plugin/bzr.pm
 Copyright: © 2008 Jelmer Vernooij <jelmer@samba.org>
            © 2006 Emanuele Aina
 License: GPL-2+
 
-Files: git.pm
+Files: IkiWiki/Plugin/git.pm
 Copyright: © 2006-2007 Recai Oktaş <roktas@debian.org>
 License: GPL-2+
 
-Files: mercurial.pm
+Files: IkiWiki/Plugin/mercurial.pm
 Copyright: © 2006 Emanuele Aina
 License: GPL-2+
 
-Files: monotone.pm listdirectives.pm progress.pm
+Files: IkiWiki/Plugin/monotone.pm IkiWiki/Plugin/listdirectives.pm
+ IkiWiki/Plugin/progress.pm
 Copyright: © 2007, 2008 William Uther
 License: GPL-2+
 
-Files: tla.pm
+Files: IkiWiki/Plugin/tla.pm
 Copyright: © 2006 Clint Adams <schizo@debian.org>
 License: GPL-2+
 
-Files: darcs.pm
+Files: IkiWiki/Plugin/darcs.pm
 Copyright: © 2006  Thomas Schwinge <tschwinge@gnu.org>
            2007  Benjamin A'Lee <bma@bmalee.eu>
            Tuomo Valkonen <tuomov@iki.fi>
@@ -42,108 +43,113 @@ Copyright: © 2006  Thomas Schwinge <tschwinge@gnu.org>
            Sven M. Hallberg <pesco@khjk.org>
 License: GPL-2+
 
-Files: teximg.pm
+Files: IkiWiki/Plugin/teximg.pm
 Copyright: © 2007 Patrick Winnertz <patrick.winnertz@skolelinux.org>
 License: GPL-2+
 
-Files: editdiff.pm
+Files: IkiWiki/Plugin/editdiff.pm
 Copyright: © 2007 Jeremie Koenig
 License: GPL-2+
 
-Files: graphviz.pm
+Files: IkiWiki/Plugin/graphviz.pm
 Copyright: © 2007 Josh Triplett
 License: GPL-2+
 
-Files: table.pm
+Files: IkiWiki/Plugin/table.pm
 Copyright: © 2007 Victor Moral <victor@taquiones.net>
 License: GPL-2+
 
-Files: more.pm
+Files: IkiWiki/Plugin/more.pm
 Copyright: © 2007 Ben
 License: GPL-2+
 
-Files: textile.pm
+Files: IkiWiki/Plugin/textile.pm
 Copyright: © 2006 mazirian
 License: GPL-2+
 
-Files: img.pm
+Files: IkiWiki/Plugin/img.pm
 Copyright: © 2006 Christian Mock <cm@tahina.priv.at>
 License: GPL-2+
 
-Files: topography.pm
+Files: IkiWiki/Plugin/topography.pm
 Copyright: © 2006 Recai Oktaş <roktas@debian.org>
 License: GPL-2+
 
-Files: map.pm
+Files: IkiWiki/Plugin/map.pm
 Copyright: © 2006 Alessandro Dotti Contra
 License: GPL-2+
 
-Files: sidebar.pm
+Files: IkiWiki/Plugin/sidebar.pm
 Copyright: © 2006 Tuomo Valkonen
 License: GPL-2+
 
-Files: htmltidy.pm
+Files: IkiWiki/Plugin/htmltidy.pm
 Copyright: © 2006 Faidon Liambotis
 License: GPL-2+
 
-Files: htmlbalance.pm underlay.pm
+Files: IkiWiki/Plugin/htmlbalance.pm IkiWiki/Plugin/underlay.pm
 Copyright: © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
 License: GPL-2+
 
-Files: polygen.pm pagestats.pm cutpaste.pm
+Files: IkiWiki/Plugin/polygen.pm IkiWiki/Plugin/pagestats.pm
+ IkiWiki/Plugin/cutpaste.pm
 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
+License: BSD-2-clause
 
-Files: calendar.pm
+Files: IkiWiki/Plugin/calendar.pm
 Copyright: (c) 2006, 2007 Manoj Srivastava <srivasta@debian.org>
 License: GPL-2+
 
-Files: hnb.pm
+Files: IkiWiki/Plugin/hnb.pm
 Copyright: Copyright (C) 2008 Axel Beckert <abe@deuxchevaux.org>
 License: GPL-2+
 
-Files: creole.pm
+Files: IkiWiki/Plugin/creole.pm
 Copyright: Copyright (C) 2008 Bernd Zeimetz <bernd@bzed.de>
 License: GPL-2+
 
-Files: txt.pm
+Files: IkiWiki/Plugin/txt.pm
 Copyright: Copyright (C) 2008 Gabriel McManus <gmcmanus@gmail.com>
 License: GPL-2+
 
-Files: color.pm
+Files: IkiWiki/Plugin/color.pm
 Copyright: Copyright (C) 2008 Paweł Tęcza <ptecza@net.icm.edu.pl>
 License: GPL-2+
 
-Files: google.pm
+Files: IkiWiki/Plugin/google.pm
 Copyright: Copyright (C) 2008 Peter Simons <simons@cryp.to>
 License: GPL-2+
 
-Files: comments.pm
+Files: IkiWiki/Plugin/comments.pm
 Copyright: © 2006-2008 Joey Hess <joey@ikiwiki.info>
            © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
 License: GPL-2+
 
-Files: po.pm
+Files: IkiWiki/Plugin/po.pm
 Copyright: © 2008-2009 intrigeri <intrigeri@boum.org>
 License: GPL-2+
 
-Files: 404.pm
+Files: IkiWiki/Plugin/404.pm
 Copyright: © 2009 Simon McVittie <http://smcv.pseudorandom.co.uk/>
 License: GPL-2+
 
-Files: transient.pm
+Files: IkiWiki/Plugin/transient.pm
 Copyright: © 2011 Simon McVittie <http://smcv.pseudorandom.co.uk/>
 License: GPL-2+
 
-Files: wmd.pm getsource.pm
+Files: IkiWiki/Plugin/wmd.pm IkiWiki/Plugin/getsource.pm
 Copyright: © 2009 William Uther
 License: GPL-2+
 
-Files: rsync.pm
+Files: IkiWiki/Plugin/cvs.pm
+Copyright: © 2009 Amitai Schlair
+License: BSD-2-clause
+
+Files: IkiWiki/Plugin/rsync.pm
 Copyright: © 2009 Amitai Schlair
 License: BSD-2-clause
 
@@ -191,10 +197,6 @@ Comment:
  Republished with permission.
 License: GPL-2+
 
-Files: cvs.pm
-Copyright: © 2009 Amitai Schlair
-License: BSD-2-clause
-
 Files: underlays/openid-selector/ikiwiki/openid/*
 Copyright: © 2008-2010 andyjm, david.j.boden
 Comment: