From 4c36a292b0889ef06ed862fa5de2408bb8c2beb0 Mon Sep 17 00:00:00 2001 From: joey Date: Tue, 11 Sep 2007 00:34:26 +0000 Subject: [PATCH 1/1] * Redid the debian/copyright file, using the proposed new copyright file format. Included many details not previously listed in the old file. --- debian/changelog | 7 +++ debian/copyright | 124 +++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 111 insertions(+), 20 deletions(-) diff --git a/debian/changelog b/debian/changelog index b58e5ffd4..3d4005416 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (2.8) UNRELEASED; urgency=low + + * Redid the debian/copyright file, using the proposed new copyright file + format. Included many details not previously listed in the old file. + + -- Joey Hess Mon, 10 Sep 2007 20:25:40 -0400 + ikiwiki (2.7) unstable; urgency=low [ Joey Hess ] diff --git a/debian/copyright b/debian/copyright index 1a2883a99..ab85fe424 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,20 +1,104 @@ -ikiwiki is copyright 2006-2007 by Joey Hess and -contributors. It is licensed under the terms of the GPL version 2 or later. -On Debian systems, the complete text of the GPL can be found in -/usr/share/common-licenses/GPL - -The git code and logo are copyright 2006 by Recai Oktaş -under the terms of the GPL version 2 or later. - -The smiley icons were copied from Moin Moin and phpBB, which have these -copyrights: - Copyright (c) 2000 - 2004 by Jürgen Hermann - Copyright (c) 1999, 2000 Martin Pool - Copyright (c) 2002 phpBB Group -Moin Moin is licensed under the terms of GPL version 2 or later, -and phpBB is licensed under the GPL version 2. - -The basewiki and templates are licensed as follows: - -Redistribution and use in source and compiled forms, with or without -modification, are permitted under any circumstances. No warranty. +Files: * +Copyright: © 2006-2007 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/* +Copyright: © 2006-2007 Joey Hess +License: other + Redistribution and use in source and compiled forms, with or without + modification, are permitted under any circumstances. No warranty. + +Files: git.pm +Copyright: © 2006-2007 Recai Oktaş +License: GPL-2+ + +Files: mercurial.pm +Copyright: © 2006 Emanuele Aina +License: GPL-2+ + +Files: monotone.pm +Copyright: © 2007 William Uther +License: GPL-2+ + +Files: tla.pm +Copyright: © 2006 Clint Adams +License: GPL-2+ + +Files: teximg.pm +Copyright: © 2007 Patrick Winnertz +License: GPL-2+ + +Files: editdiff.pm +Copyright: © 2007 Jeremie Koenig +License: GPL-2+ + +Files: graphviz.pm +Copyright: © 2007 Josh Triplett +License: GPL-2+ + +Files: table.pm +Copyright: © 2007 Victor Moral +License: GPL-2+ + +Files: more.pm +Copyright: © 2007 Ben +License: GPL-2+ + +Files: textile.pm +Copyright: © 2006 mazirian +License: GPL-2+ + +Files: img.pm +Copyright: © 2006 Christian Mock +License: GPL-2+ + +Files: topography.pm +Copyright: © 2006 Recai Oktaş +License: GPL-2+ + +Files: rst.pm +Copyright: © 2006 Sergio Talens-Oliag +License: GPL-2+ + +Files: map.pm +Copyright: © 2006 Alessandro Dotti Contra +License: GPL-2+ + +Files: sidebar.pm +Copyright: © 2006 Tuomo Valkonen +License: GPL-2+ + +Files: htmltidy.pm +Copyright: © 2006 Faidon Liambotis +License: GPL-2+ + +Files: polygen.pm, pagestats.pm +Copyright: © 2006 Enrico Zini +License: GPL-2+ + +Files: doc/logo/* +Copyright: © 2006 Recai Oktaş +License: GPL-2+ + +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. + +Files: doc/smileys/neutral.png + 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+ + First published on LinuxWorld.com, a publication of Network World Inc., + 118 Turnpike Rd., Southboro, MA 01772. + . + Republished with permission. -- 2.39.5