X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=debian%2Fcopyright;h=b6dd3782b639720b4e69bd5163df94ae52577a0a;hp=ad72a04595f342c2733931a66f46238eaa96b93b;hb=378c64776856ee1313c030375a921e8acb4ff1ef;hpb=54f600af14bf6dc067ffc30ec6f22d517001fe99 diff --git a/debian/copyright b/debian/copyright index ad72a0459..b6dd3782b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,11 +1,11 @@ Files: * -Copyright: © 2006-2008 Joey Hess +Copyright: © 2006-2010 Joey Hess 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/* -Copyright: © 2006-2008 Joey Hess +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. @@ -191,6 +191,13 @@ License: GPL-2+ Files: cvs.pm Copyright: © 2009 Amitai Schlair +License: BSD-C2 + +Files: underlays/javascript/ikiwiki/openid-selector/* +Copyright: © 2008-2010 andyjm, david.j.boden +License: BSD-C2 + From http://code.google.com/p/openid-selector/ + License: BSD-C2 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions