diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-02-05 15:59:42 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-02-05 15:59:42 -0500 |
| commit | f92505d78b82c6ac146e43054ebd12441575a602 (patch) | |
| tree | 2897a21c04f473ee3100a6a59ccce6336a1f7692 /debian/copyright | |
| parent | fbe2ab4419e086ff84991bf25f1549aaabc5143b (diff) | |
| parent | 11f4942d68f3276bfdc4688e4091e559f9481874 (diff) | |
Merge branch 'master' into prefix-directives
Diffstat (limited to 'debian/copyright')
| -rw-r--r-- | debian/copyright | 10 |
1 files changed, 8 insertions, 2 deletions
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+ |