Merge branch 'master' of git://github.com/joeyh/ikiwiki

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 870abfdd575125c8559fba415de27ab5eebb1248..a5b07aac167a3bad980b7fca531b25da019cf163 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 ikiwiki (3.1415926) UNRELEASED; urgency=low
 
+  [ Joey Hess ]
   * po: Detect if nowrapi18n can't be passed to po4a, and warn about
     the old version, but continue. Closes: #541205 
   * inline: Avoid use of my $_ as it fails with older perls.
@@ -37,6 +38,12 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low
   * po: fix interdiction to create pages of type po (intrigeri)
   * po: po: favor the type of linking page's masterpage on page creation
     (intrigeri)
+  * img: Don't generate new verison of image if it is scaled to be
+    larger in either dimension.
+
+  [ Josh Triplett ]
+  * teximg: Replace the insufficient blacklist with the built-in security
+    mechanisms of TeX.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400