* Relicense the templates and basewiki under the 2-clause BSD license.

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 29316cc7a308265e9a9770641ba9f353ddff36e8..2bf2665c717a86067b6b543d69a1855756af4ed9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,20 @@
-ikiwiki (1.18) UNRELEASED; urgency=low
+ikiwiki (1.20) UNRELEASED; urgency=low
+
+  * Relicense the templates and basewiki under the 2-clause BSD license.
+    Since these can easily become part of other people's websites, they
+    should be under as permissive a license as possible.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 16 Aug 2006 16:30:44 -0400
+
+ikiwiki (1.19) unstable; urgency=low
+
+  * Fix several related bugs in page type determination during online editing.
+  * Add some locking to prevent 2 aggregators from running at once.
+  * Fix an infinite loop in the aggregator when finding a unique filename.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 16 Aug 2006 13:46:25 -0400
+
+ikiwiki (1.18) unstable; urgency=low
 
   * The last release accidentially installed ikiwiki as ikiwiki.pl, now fixed.
   * Add --version.
@@ -16,7 +32,7 @@ ikiwiki (1.18) UNRELEASED; urgency=low
     should be fully supported throughout ikiwiki.
   * Recommend rebuilding wikis on upgrade to this version.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 12 Aug 2006 21:26:29 -0400
+ -- Joey Hess <joeyh@debian.org>  Sat, 12 Aug 2006 22:10:48 -0400
 
 ikiwiki (1.17) unstable; urgency=low