X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/642f73a39fa5249e01b384cda24e44bfb805e971..065f298986eff2577b87aa3801e1ea9e8f135c87:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index fb4a734bf..a636a45f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-ikiwiki (1.1) UNRELEASED; urgency=low
+ikiwiki (1.2) UNRELEASED; urgency=low
+
+  * Remove dups from the brokenlinks list.
+  * Add libc6-dev to dependencies, needed to build wrappers.
+
+ -- Joey Hess <joeyh@debian.org>  Mon,  8 May 2006 19:00:16 -0400
+
+ikiwiki (1.1) unstable; urgency=low
 
   * Rename inlinepage to depends, so that it can be used to refer to more
     dependency relationships than just inlining. This will require a rebuild
@@ -43,8 +50,14 @@ ikiwiki (1.1) UNRELEASED; urgency=low
   * Copied in some smileys from Moin Moin.
   * Allow links of the form [[some page|page]], with whitespace in the link
     text.
+  * Removed --sanitize and --no-sanitize, replaced with --plugin htmlscrubber
+    and --disable-plugin htmlscrubber.
+  * Allow discussion links on pages to be turned off with --no-discussion.
+  * Add ikiwiki-mass-rebuild script, ripped out of the postinst.
+  * Add some new config items to the estseek.conf template, which are needed
+    by hyperestraier 1.2.3.
 
- -- Joey Hess <joeyh@debian.org>  Thu,  4 May 2006 14:46:46 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri,  5 May 2006 17:00:41 -0400
 
 ikiwiki (1.0) unstable; urgency=low