Merge branch 'master' into darcs

4 files changed, 31 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 1320e4f41..ecef4f158 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,22 @@
-ikiwiki (2.66) UNRELEASED; urgency=low
+ikiwiki (2.67) UNRELEASED; urgency=low
+
+  * remove: Avoid $_ breakage. (Stupid, stupid perl.)
+  * Updated Spanish translation from Victor Moral.
+  * lockedit: Support specifying which users (and IP addresses) a page
+    is locked for. This supports most of the ACL type things users have been
+    wanting to be done. Closes: #443346 (It does not control who can read a
+    page, but that's out of scope for ikiwiki.)
+  * orphans: Fix unquoted page name in regexp.
+  * google: Plugin provides google site search, contributed by Peter Simons.
+  * Pass HTTPS variable through the wrapper so that CGI->https can be used
+    by plugins. Closes: #502047
+  * inline: Allow MTIME to be used in inlinepage.tmpl.
+  * inline: Use the feed's description in the rss and atom links.
+    Closes: #502113
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 06 Oct 2008 16:07:50 -0400
+
+ikiwiki (2.66) unstable; urgency=low
 
   * recentchanges: Fix redirects to non-page files. 
   * aggregate: Avoid uninitialized value warnings for pages with no recorded
@@ -32,8 +50,13 @@ ikiwiki (2.66) UNRELEASED; urgency=low
     (Sponsored by The TOVA Company.)
   * httpauth: Document that ikiwiki.cgi has to be in a directory subject to
     authentication. Closes: #500524 
+  * inline: Fix handling of rootpage that doesn't exist.
+  * attachment: Support adding attachments to pages even as they are being
+    created.
+  * remove, rename: Allow acting on attachments as a page is being created.
+  * Updated French translation. Closes: #500929
 
- -- Joey Hess <joeyh@debian.org>  Thu, 25 Sep 2008 13:45:55 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 05 Oct 2008 19:11:08 -0400
 
 ikiwiki (2.65) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b900052dc..fdf2a3a36 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Build-Depends: perl, debhelper (>= 5)
 Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libtext-markdown-perl | markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl, perlmagick
 Maintainer: Joey Hess <joeyh@debian.org>
-Uploaders: Joey Hess <joeyh@debian.org>, Josh Triplett <josh@freedesktop.org>
+Uploaders: Josh Triplett <josh@freedesktop.org>
 Standards-Version: 3.8.0
 Homepage: http://ikiwiki.info/
 Vcs-Git: git://git.ikiwiki.info/
diff --git a/debian/copyright b/debian/copyright
index 87f3cac89..f257234dd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -104,6 +104,10 @@ Files: color.pm
 Copyright: Copyright (C) 2008 Paweł Tęcza <ptecza@net.icm.edu.pl>
 License: GPL-2+
 
+Files: google.pm
+Copyright: Copyright (C) 2008 Peter Simons <simons@cryp.to>
+License: GPL-2+
+
 Files: doc/logo/*
 Copyright: © 2006 Recai Oktaş <roktas@debian.org>
 License: GPL-2+
diff --git a/debian/preinst b/debian/preinst
index 12d3d83af..c588901df 100755
--- a/debian/preinst
+++ b/debian/preinst
@@ -1,5 +1,5 @@
 #!/bin/sh
-
+set -e
 #DEBHELPER#
 
 if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 1.2; then