From d75c1209a5b07cae417aabee56c3414743610f93 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 13 Jan 2011 17:48:22 -0400 Subject: update copyright format to DEP-5 --- debian/copyright | 114 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 61 insertions(+), 53 deletions(-) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index 300dd110b..799a354c4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,19 +1,20 @@ +Format: http://dep.debian.net/deps/dep5/ +Source: native package + Files: * -Copyright: © 2006-2010 Joey Hess +Copyright: © 2006-2011 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/* +Files: templates/* underlays/basewiki/* doc/ikiwiki/directive/* + ikiwiki.setup po/underlay/* 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. Files: bzr.pm -Copyright: - © 2008 Jelmer Vernooij - © 2006 Emanuele Aina +Copyright: © 2008 Jelmer Vernooij + © 2006 Emanuele Aina License: GPL-2+ Files: git.pm @@ -24,7 +25,7 @@ Files: mercurial.pm Copyright: © 2006 Emanuele Aina License: GPL-2+ -Files: monotone.pm, listdirectives.pm, progress.pm +Files: monotone.pm listdirectives.pm progress.pm Copyright: © 2007, 2008 William Uther License: GPL-2+ @@ -33,13 +34,12 @@ Copyright: © 2006 Clint Adams License: GPL-2+ Files: darcs.pm -Copyright: - © 2006 Thomas Schwinge - 2007 Benjamin A'Lee - Tuomo Valkonen - 2008 Simon Michael - Petr Ročkai - Sven M. Hallberg +Copyright: © 2006 Thomas Schwinge + 2007 Benjamin A'Lee + Tuomo Valkonen + 2008 Simon Michael + Petr Ročkai + Sven M. Hallberg License: GPL-2+ Files: teximg.pm @@ -86,15 +86,15 @@ Files: htmltidy.pm Copyright: © 2006 Faidon Liambotis License: GPL-2+ -Files: htmlbalance.pm, underlay.pm +Files: htmlbalance.pm underlay.pm Copyright: © 2008 Simon McVittie License: GPL-2+ -Files: polygen.pm, pagestats.pm, cutpaste.pm +Files: polygen.pm pagestats.pm cutpaste.pm Copyright: © 2006 Enrico Zini License: GPL-2+ -Files: plugins/rst, plugins/proxy.py, plugins/pythondemo +Files: plugins/rst plugins/proxy.py plugins/pythondemo Copyright: © martin f. krafft License: GPL-2 @@ -123,9 +123,8 @@ Copyright: Copyright (C) 2008 Peter Simons License: GPL-2+ Files: comments.pm -Copyright: - © 2006-2008 Joey Hess - © 2008 Simon McVittie +Copyright: © 2006-2008 Joey Hess + © 2008 Simon McVittie License: GPL-2+ Files: po.pm @@ -136,79 +135,79 @@ Files: 404.pm Copyright: © 2009 Simon McVittie License: GPL-2+ -Files: wmd.pm, getsource.pm +Files: wmd.pm getsource.pm Copyright: © 2009 William Uther License: GPL-2+ Files: rsync.pm Copyright: © 2009 Amitai Schlair -License: BSD-C2 +License: BSD-2-clause Files: doc/logo/* Copyright: © 2006 Recai Oktaş License: GPL-2+ Files: po/* -Copyright: - 2007 Damyan Ivanov - 2007-2009 Miroslav Kure - 2008 Jonas Smedegaard - 2008 Kai Wasserbäch - 2008-2009 Kurt Gramlich - 2007 Kartik Mistry - 2007 Pawel Tecza - 2007, 2009 Víctor Moral - 2007 Jean-Luc Coulon (f5ibh) - 2008 Christian Perrier - 2007 Cyril Brulebois - 2007 Daniel Nylander - 2009 Fernando González de Requena - 2010 Sebastian Kuhnert -License: +Copyright: 2007 Damyan Ivanov + 2007-2009 Miroslav Kure + 2008 Jonas Smedegaard + 2008 Kai Wasserbäch + 2008-2009 Kurt Gramlich + 2007 Kartik Mistry + 2007 Pawel Tecza + 2007, 2009 Víctor Moral + 2007 Jean-Luc Coulon (f5ibh) + 2008 Christian Perrier + 2007 Cyril Brulebois + 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. Files: doc/smileys/* -Copyright: - (c) 2000 - 2004 by Jürgen Hermann - (c) 1999, 2000 Martin Pool +Copyright: (c) 2000 - 2004 by Jürgen Hermann + (c) 1999, 2000 Martin Pool License: GPL-2+ Smileys were copied from Moin Moin. Files: doc/smileys/neutral.png - doc/smileys/question.pn + doc/smileys/question.pn Copyright: (c) 2002 phpBB Group License: GPL-2 These smileys were copied from phpBB. Files: doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn Copyright: © 2007 Joey Hess , LinuxWorld.com -License: GPL-2+ +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: cvs.pm Copyright: © 2009 Amitai Schlair -License: BSD-C2 +License: BSD-2-clause Files: underlays/openid-selector/ikiwiki/openid/* Copyright: © 2008-2010 andyjm, david.j.boden -License: BSD-C2 - From http://code.google.com/p/openid-selector/ +Comment: + From http://code.google.com/p/openid-selector/ +License: BSD-2-clause Files: underlays/openid-selector/ikiwiki/openid/jquery.js Copyright: © 2005-2008 by John Resig, Branden Aaron & Jörn Zaefferer License: GPL-2 Files: underlays/themes/blueview/style.css -Copyright: - © 2009,2010 Bernd Zeimetz - © 2008 Yahoo! Inc. +Copyright: © 2009,2010 Bernd Zeimetz + © 2008 Yahoo! Inc. +Comment: + Parts derived from BSD-3-clause licensed YUI library. + http://developer.yahoo.com/yui/license.html License: GPL-2+ - Parts derived from BSD-C3 licensed YUI library. - http://developer.yahoo.com/yui/license.html Files: underlays/themes/blueview/* Copyright: © 2009,2010 Bernd Zeimetz @@ -218,7 +217,7 @@ Files: underlays/themes/goldtype/* Copyright: © Lars Wirzenius License: GPL-2+ -License: BSD-C2 +License: BSD-2-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -240,3 +239,12 @@ License: BSD-C2 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +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. + +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. + -- cgit v1.2.3