diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-01-29 20:42:32 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-01-29 20:42:32 -0500 |
| commit | 002cf74f182dbf70ea3d85f8e8e4117ecdc38621 (patch) | |
| tree | 5e8b22aeeab62ec2399585736ea21acc5287204f | |
| parent | cb670988ea416d5aa99d95ea9f4cbbd1ee956ee1 (diff) | |
* Copyright file updates.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/copyright | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 492ac4caf..48415fa67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,7 @@ ikiwiki (2.30) UNRELEASED; urgency=low * Fix encoding bug when pagestate values contained spaces. * Add support for bzr, written by Jelmer Vernooij. Thanks also to bma for his independent work on bzr support. + * Copyright file updates. -- Joey Hess <joeyh@debian.org> Fri, 11 Jan 2008 15:09:37 -0500 diff --git a/debian/copyright b/debian/copyright index e6e164aca..78b155f6c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,15 +1,21 @@ Files: * -Copyright: © 2006-2007 Joey Hess <joey@ikiwiki.info> +Copyright: © 2006-2008 Joey Hess <joey@ikiwiki.info> 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/*, ikiwiki.setup -Copyright: © 2006-2007 Joey Hess <joey@ikiwiki.info> +Copyright: © 2006-2008 Joey Hess <joey@ikiwiki.info> 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 <jelmer@samba.org> + © 2006 Emanuele Aina +License: GPL-2+ + Files: git.pm Copyright: © 2006-2007 Recai Oktaş <roktas@debian.org> License: GPL-2+ |