Added a comment

[ikiwiki.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 72394eadc215ecb3d87c170fb536f7026cfa91eb..e1a81932b2f0a5b8145aecbf33f73cb9063f20e5 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,216 +1,258 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: native package
+

 Files: *
 Files: *

-Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info>
+Copyright: © 2006-2011 Joey Hess <joey@ikiwiki.info>

 License: GPL-2+
 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/*, doc/ikiwiki/directive/*, ikiwiki.setup, po/underlay/*
+Files: templates/* underlays/basewiki/* doc/ikiwiki/directive/*
+ ikiwiki.setup po/underlay/*

 Copyright: © 2006-2010 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.
 
 Copyright: © 2006-2010 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.
 

-Files: bzr.pm
-Copyright:
- © 2008 Jelmer Vernooij <jelmer@samba.org>
- © 2006 Emanuele Aina
+Files: IkiWiki/Plugin/bzr.pm
+Copyright: © 2008 Jelmer Vernooij <jelmer@samba.org>
+           © 2006 Emanuele Aina

 License: GPL-2+
 
 License: GPL-2+
 

-Files: git.pm
+Files: IkiWiki/Plugin/git.pm

 Copyright: © 2006-2007 Recai Oktaş <roktas@debian.org>
 License: GPL-2+
 
 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+
 
 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+
 
 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+
 
 Copyright: © 2006 Clint Adams <schizo@debian.org>
 License: GPL-2+
 

-Files: darcs.pm
-Copyright:
- © 2006  Thomas Schwinge <tschwinge@gnu.org>
-   2007  Benjamin A'Lee <bma@bmalee.eu>
-         Tuomo Valkonen <tuomov@iki.fi>
-   2008  Simon Michael <simon@joyful.com>
-         Petr Ročkai <me@mornfall.net>
-         Sven M. Hallberg <pesco@khjk.org>
+Files: IkiWiki/Plugin/darcs.pm
+Copyright: © 2006  Thomas Schwinge <tschwinge@gnu.org>
+           2007  Benjamin A'Lee <bma@bmalee.eu>
+           Tuomo Valkonen <tuomov@iki.fi>
+           2008  Simon Michael <simon@joyful.com>
+           Petr Ročkai <me@mornfall.net>
+           Sven M. Hallberg <pesco@khjk.org>

 License: GPL-2+
 
 License: GPL-2+
 

-Files: teximg.pm
+Files: IkiWiki/Plugin/teximg.pm

 Copyright: © 2007 Patrick Winnertz <patrick.winnertz@skolelinux.org>
 License: GPL-2+
 
 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+
 
 Copyright: © 2007 Jeremie Koenig
 License: GPL-2+
 

-Files: graphviz.pm
+Files: IkiWiki/Plugin/graphviz.pm

 Copyright: © 2007 Josh Triplett
 License: GPL-2+
 
 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+
 
 Copyright: © 2007 Victor Moral <victor@taquiones.net>
 License: GPL-2+
 

-Files: more.pm
+Files: IkiWiki/Plugin/more.pm

 Copyright: © 2007 Ben
 License: GPL-2+
 
 Copyright: © 2007 Ben
 License: GPL-2+
 

-Files: textile.pm
+Files: IkiWiki/Plugin/textile.pm

 Copyright: © 2006 mazirian
 License: GPL-2+
 
 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+
 
 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+
 
 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+
 
 Copyright: © 2006 Alessandro Dotti Contra
 License: GPL-2+
 

-Files: sidebar.pm
+Files: IkiWiki/Plugin/sidebar.pm

 Copyright: © 2006 Tuomo Valkonen
 License: GPL-2+
 
 Copyright: © 2006 Tuomo Valkonen
 License: GPL-2+
 

-Files: htmltidy.pm
+Files: IkiWiki/Plugin/htmltidy.pm

 Copyright: © 2006 Faidon Liambotis
 License: GPL-2+
 
 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+
 
 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+
 
 Copyright: © 2006 Enrico Zini
 License: GPL-2+
 

-Files: plugins/rst, plugins/proxy.py, plugins/pythondemo
+Files: plugins/rst plugins/proxy.py plugins/pythondemo

 Copyright: © martin f. krafft <madduck@madduck.net>
 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+
 
 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+
 
 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+
 
 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+
 
 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+
 
 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+
 
 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/>
+Files: IkiWiki/Plugin/comments.pm
+Copyright: © 2006-2008 Joey Hess <joey@ikiwiki.info>
+           © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>

 License: GPL-2+
 
 License: GPL-2+
 

-Files: po.pm
+Files: IkiWiki/Plugin/po.pm

 Copyright: © 2008-2009 intrigeri <intrigeri@boum.org>
 License: GPL-2+
 
 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+
 
 Copyright: © 2009 Simon McVittie <http://smcv.pseudorandom.co.uk/>
 License: GPL-2+
 

-Files: wmd.pm, getsource.pm
+Files: IkiWiki/Plugin/transient.pm
+Copyright: © 2011 Simon McVittie <http://smcv.pseudorandom.co.uk/>
+License: GPL-2+
+
+Files: IkiWiki/Plugin/wmd.pm IkiWiki/Plugin/getsource.pm

 Copyright: © 2009 William Uther
 License: GPL-2+
 
 Copyright: © 2009 William Uther
 License: GPL-2+
 

-Files: rsync.pm
+Files: IkiWiki/Plugin/cvs.pm

 Copyright: © 2009 Amitai Schlair
 Copyright: © 2009 Amitai Schlair

-License: BSD-C2
+License: BSD-2-clause
+
+Files: IkiWiki/Plugin/rsync.pm
+Copyright: © 2009 Amitai Schlair
+License: BSD-2-clause
+
+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+
 
 Files: po/*
 
 Files: doc/logo/*
 Copyright: © 2006 Recai Oktaş <roktas@debian.org>
 License: GPL-2+
 
 Files: po/*

-Copyright:
-  2007 Damyan Ivanov <dam@modsodtsys.com>
-  2007-2009 Miroslav Kure <kurem@debian.cz>
-  2008 Jonas Smedegaard <dr@jones.dk>
-  2008 Kai Wasserbäch <debian@carbon-project.org>
-  2008-2009 Kurt Gramlich <kurt@skolelinux.de>
-  2007 Kartik Mistry <kartik.mistry@gmail.com>
-  2007 Pawel Tecza <ptecza@net.icm.edu.pl>
-  2007, 2009 Víctor Moral <victor@taquiones.net>
-  2007 Jean-Luc Coulon (f5ibh) <jean-luc.coulon@«anadoo.fr>
-  2008 Christian Perrier <bubulle@debian.org>
-  2007 Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
-  2007 Daniel Nylander <po@danielnylander.se>
-  2009 Fernando González de Requena <fgrequena@gmail.com>
-  2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
-License: 
+Copyright: 2007 Damyan Ivanov <dam@modsodtsys.com>
+           2007-2009 Miroslav Kure <kurem@debian.cz>
+           2008 Jonas Smedegaard <dr@jones.dk>
+           2008 Kai Wasserbäch <debian@carbon-project.org>
+           2008-2009 Kurt Gramlich <kurt@skolelinux.de>
+           2007 Kartik Mistry <kartik.mistry@gmail.com>
+           2007 Pawel Tecza <ptecza@net.icm.edu.pl>
+           2007, 2009 Víctor Moral <victor@taquiones.net>
+           2007 Jean-Luc Coulon (f5ibh) <jean-luc.coulon@«anadoo.fr>
+           2008 Christian Perrier <bubulle@debian.org>
+           2007 Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
+           2007 Daniel Nylander <po@danielnylander.se>
+           2009 Fernando González de Requena <fgrequena@gmail.com>
+           2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+License: other

  Redistribution and use in source and compiled forms, with or without
  modification, are permitted under any circumstances. No warranty.
 
 Files: doc/smileys/*
  Redistribution and use in source and compiled forms, with or without
  modification, are permitted under any circumstances. No warranty.
 
 Files: doc/smileys/*

-Copyright:
- (c) 2000 - 2004 by Jürgen Hermann <jh@web.de>
- (c) 1999, 2000 Martin Pool <mbp@humbug.org.au>
+Copyright: (c) 2000 - 2004 by Jürgen Hermann <jh@web.de>
+           (c) 1999, 2000 Martin Pool <mbp@humbug.org.au>

 License: GPL-2+
  Smileys were copied from Moin Moin.
 
 Files: doc/smileys/neutral.png
 License: GPL-2+
  Smileys were copied from Moin Moin.
 
 Files: doc/smileys/neutral.png

-       doc/smileys/question.pn
+ doc/smileys/question.pn

 Copyright: (c) 2002 phpBB Group
 License: GPL-2
  These smileys were copied from phpBB.
 
 Files: doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn
 Copyright: © 2007 Joey Hess <joeyh@ikiwiki.info>, LinuxWorld.com
 Copyright: (c) 2002 phpBB Group
 License: GPL-2
  These smileys were copied from phpBB.
 
 Files: doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn
 Copyright: © 2007 Joey Hess <joeyh@ikiwiki.info>, LinuxWorld.com

-License: GPL-2+
+Comment: 

  First published on LinuxWorld.com, a publication of Network World Inc.,
  118 Turnpike Rd., Southboro, MA 01772.
  .
  Republished with permission.
  First published on LinuxWorld.com, a publication of Network World Inc.,
  118 Turnpike Rd., Southboro, MA 01772.
  .
  Republished with permission.

-
-Files: cvs.pm
-Copyright: © 2009 Amitai Schlair
-License: BSD-C2
+License: GPL-2+

 
 Files: underlays/openid-selector/ikiwiki/openid/*
 Copyright: © 2008-2010 andyjm, david.j.boden
 
 Files: underlays/openid-selector/ikiwiki/openid/*
 Copyright: © 2008-2010 andyjm, david.j.boden

-License: BSD-C2
-  From http://code.google.com/p/openid-selector/
+Comment: 
+ From http://code.google.com/p/openid-selector/
+License: BSD-2-clause
+
+Files: underlays/jquery/*
+Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer
+           © 2011 The Dojo Foundation
+License: GPL-2

 
 

-Files: underlays/openid-selector/ikiwiki/openid/jquery.js
-Copyright: © 2005-2008 by John Resig, Branden Aaron & Jörn Zaefferer
+Files: underlays/attachments/ikiwiki/jquery-ui*
+Copyright: © 2008 Paul Bakaus
+           © 2011 the jQuery UI Authors (http://jqueryui.com/about)

 License: GPL-2
 
 License: GPL-2
 

-Files: underlays/themes/bzed/*
-Copyright: 
- © 2009,2010 Bernd Zeimetz
- © 2008 Yahoo! Inc.
+Files: underlays/attachments/ikiwiki/jquery.tmpl*
+Copyright: © Boris Moore
+License: GPL-2
+
+Files: underlays/attachments/ikiwiki/
+Copyright: 2010, 2011 Sebastian Tschan
+Comment:
+ blueimp / jQuery-File-Upload widget,
+ from https://github.com/blueimp/jQuery-File-Upload
+License: Expat
+
+Files: underlays/themes/blueview/style.css
+Copyright: © 2009,2010 Bernd Zeimetz
+           © 2008 Yahoo! Inc.
+Comment:
+ Parts derived from BSD-3-clause licensed YUI library.
+ http://developer.yahoo.com/yui/license.html
+License: GPL-2+
+
+Files: underlays/themes/blueview/*
+Copyright: © 2009,2010 Bernd Zeimetz

 License: GPL-2+
 License: GPL-2+

-  Parts derived from BSD-C3 licensed YUI library.
-  http://developer.yahoo.com/yui/license.html

 
 

-License: BSD-C2
+Files: underlays/themes/goldtype/*
+Copyright: © Lars Wirzenius
+License: GPL-2+
+
+Files: underlays/themes/monochrome/*
+Copyright: © 2012 Jon Dowland
+License: GPL-2+
+
+License: BSD-2-clause

  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:


@@ -232,3 +274,30 @@ License: BSD-C2
  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.

+
+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.
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ this software and associated documentation files (the "Software"), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is furnished to do
+ so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.