From bde823191e842d136a7a73176eaf50eb12fa6f6e Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 9 Jun 2015 22:28:28 +0100 Subject: debian/copyright: consolidate permissive licenses --- debian/copyright | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'debian/copyright') diff --git a/debian/copyright b/debian/copyright index e14398acd..1940441ae 100644 --- 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 -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,9 +174,7 @@ 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 @@ -230,9 +226,7 @@ Files: 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 @@ -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 -- cgit v1.2.3