(no commit message)

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

diff --git a/debian/copyright b/debian/copyright
index e14398acdb71cf93b4ae9be1956b176f0aed4fc8..514910f264860ff14a9f7055a20e525e0e1705c1 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,9 +8,7 @@ License: GPL-2+
 Files: templates/* underlays/basewiki/* doc/ikiwiki/directive/*
  ikiwiki.setup po/underlays/*
 Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info>
 Files: templates/* underlays/basewiki/* doc/ikiwiki/directive/*
  ikiwiki.setup po/underlays/*
 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.
+License: permissive

 
 Files: IkiWiki/Plugin/bzr.pm
 Copyright: © 2008 Jelmer Vernooij <jelmer@samba.org>
 
 Files: IkiWiki/Plugin/bzr.pm
 Copyright: © 2008 Jelmer Vernooij <jelmer@samba.org>


@@ -176,21 +174,19 @@ Copyright: 2007 Damyan Ivanov <dam@modsodtsys.com>
            2007 Daniel Nylander <po@danielnylander.se>
            2009 Fernando González de Requena <fgrequena@gmail.com>
            2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
            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.
+License: permissive

 
 Files: doc/smileys/*
 Copyright: (c) 2000 - 2004 by Jürgen Hermann <jh@web.de>
            (c) 1999, 2000 Martin Pool <mbp@humbug.org.au>
 License: GPL-2+
 
 Files: doc/smileys/*
 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.
+Comment: Smileys were copied from Moin Moin.

 
 Files: doc/smileys/neutral.png
  doc/smileys/question.png
 Copyright: (c) 2002 phpBB Group
 License: GPL-2
 
 Files: doc/smileys/neutral.png
  doc/smileys/question.png
 Copyright: (c) 2002 phpBB Group
 License: GPL-2

- These smileys were copied from phpBB.
+Comment: These smileys were copied from phpBB.

 
 Files: doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn
 Copyright: © 2007 Joey Hess <joeyh@ikiwiki.info>, LinuxWorld.com
 
 Files: doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn
 Copyright: © 2007 Joey Hess <joeyh@ikiwiki.info>, LinuxWorld.com


@@ -230,9 +226,7 @@ Files:
  underlays/openid-selector/ikiwiki/login-selector/verisign.png
 Copyright:
  © 2014 Simon McVittie
  underlays/openid-selector/ikiwiki/login-selector/verisign.png
 Copyright:
  © 2014 Simon McVittie

-License: other
- Redistribution and use in source and compiled forms, with or without
- modification, are permitted under any circumstances. No warranty.
+License: permissive

 
 Files: underlays/jquery/*
 Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer
 
 Files: underlays/jquery/*
 Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer


@@ -284,6 +278,10 @@ Comment:
 Copyright: none
 License: public-domain
 
 Copyright: none
 License: public-domain
 

+License: permissive
+ Redistribution and use in source and compiled forms, with or without
+ modification, are permitted under any circumstances. No warranty.
+

 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions