summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
-rw-r--r--debian/copyright5
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index a8b6e012e..f298045a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
ikiwiki (1.7) UNRELEASED; urgency=low
* Updated logo from Recai with some kerning and alingment tuning.
+ * Patch from Recai to fix git recentchanges code to work with git 1.4 which
+ changed some output.
+ * Copyright update.
- -- Joey Hess <joeyh@debian.org> Sun, 18 Jun 2006 19:39:36 -0400
+ -- Joey Hess <joeyh@debian.org> Sun, 18 Jun 2006 23:30:49 -0400
ikiwiki (1.6) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 4260584e1..ed1dbd08b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,8 @@
ikiwiki is copyright 2006 by Joey Hess <joey@kitenet.net>. It is licensed
-under the terms of the GPL.
+under the terms of the GPL version 2 or later.
+
+The git code and logo are copyright 2006 by Recai Oktaş <roktas@debian.org>
+under the terms of the GPL version 2 or later.
The smiley icons were copied from Moin Moin, which has these copyrights:
Copyright (c) 2000 - 2004 by Jürgen Hermann <jh@web.de>