X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2cf7b1fc644c1e070dc79bad6411e5307d454a20..847c9f232efad6820cb7788994c2418a8cb89992:/debian/copyright diff --git a/debian/copyright b/debian/copyright index e14398acd..28b5aa591 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,11 +6,9 @@ Copyright: © 2006-2011 Joey Hess License: GPL-2+ Files: templates/* underlays/basewiki/* doc/ikiwiki/directive/* - ikiwiki.setup po/underlays/* + ikiwiki.setup po/underlays/* underlays/javascript/* Copyright: © 2006-2010 Joey Hess -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 @@ -176,45 +174,43 @@ Copyright: 2007 Damyan Ivanov 2007 Daniel Nylander 2009 Fernando González de Requena 2010 Sebastian Kuhnert -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 (c) 1999, 2000 Martin Pool 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 - 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 , LinuxWorld.com -Comment: +Comment: First published on LinuxWorld.com, a publication of Network World Inc., 118 Turnpike Rd., Southboro, MA 01772. . Republished with permission. License: GPL-2+ -Files: underlays/openid-selector/ikiwiki/login-selector/* +Files: underlays/login-selector/ikiwiki/login-selector/* Copyright: © 2008-2010 andyjm, david.j.boden -Comment: - From http://code.google.com/p/openid-selector/ +Comment: + Based on https://code.google.com/archive/p/openid-selector/ License: BSD-2-clause -Files: underlays/openid-selector/ikiwiki/login-selector/goa-* +Files: underlays/login-selector/ikiwiki/login-selector/goa-* Copyright: © 2011 Red Hat, Inc. License: LGPL-2.1+ Comment: taken from data/icons/16x16/ in gnome-online-accounts git -Files: underlays/openid-selector/ikiwiki/login-selector/wordpress.png +Files: underlays/login-selector/ikiwiki/login-selector/wordpress.png Copyright: © 2003-2013 "the contributors" License: GPL-2+ @@ -226,13 +222,11 @@ Files: icons/aol.svg icons/livejournal.svg icons/verisign.svg - underlays/openid-selector/ikiwiki/login-selector/aol.png - underlays/openid-selector/ikiwiki/login-selector/verisign.png + underlays/login-selector/ikiwiki/login-selector/aol.png + underlays/login-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 @@ -284,6 +278,10 @@ Comment: 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 @@ -332,7 +330,7 @@ License: Expat 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. + SOFTWARE. License: LGPL-2.1+ This library is free software; you can redistribute it and/or