* Copyright file updates.

diff --git a/debian/changelog b/debian/changelog
index 492ac4cafac057bfcdc7c4e2be643eaa259b727d..48415fa67652352d909bd4e77e16b4d1e850ead1 100644 (file)
--- 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.
   * 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
 
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jan 2008 15:09:37 -0500
 

diff --git a/debian/copyright b/debian/copyright
index e6e164aca097fa3ca39059344251ba8e2639ce60..78b155f6ca533effdcf1e0a63fdf903907db3617 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,21 @@
 Files: *
 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
 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.
 
 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+
 Files: git.pm
 Copyright: © 2006-2007 Recai Oktaş <roktas@debian.org>
 License: GPL-2+