X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7a96363c6df53474d24cd9bf885c5a13941cf72b..c142dba356b757facd6684a99623c58430b7221e:/debian/copyright diff --git a/debian/copyright b/debian/copyright index 514910f26..f306a3a7e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,7 +6,7 @@ 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: permissive @@ -140,11 +140,11 @@ Copyright: © 2009 William Uther License: GPL-2+ Files: IkiWiki/Plugin/cvs.pm -Copyright: © 2009 Amitai Schlair +Copyright: © 2009 Amitai Schleier License: BSD-2-clause Files: IkiWiki/Plugin/rsync.pm -Copyright: © 2009 Amitai Schlair +Copyright: © 2009 Amitai Schleier License: BSD-2-clause Files: IkiWiki/Plugin/osm.pm @@ -190,27 +190,27 @@ 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+ @@ -222,8 +222,8 @@ 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: permissive @@ -330,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