From fedaead1d016d52529f8c16444248bf4c3ab8779 Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sun, 15 Apr 2007 18:10:39 +0000
Subject: [PATCH] * Add .dpkg-tmp to prune regexp, so that if ikiwiki is run
 right as it's   being upgraded by dpkg it will ignore dpkg temp files in the
 basewiki.

---
 IkiWiki.pm       | 3 ++-
 debian/changelog | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 679ca716e..5f0055d3e 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -31,7 +31,8 @@ memoize("file_pruned");
 sub defaultconfig () { #{{{
 	wiki_file_prune_regexps => [qr/\.\./, qr/^\./, qr/\/\./,
 		qr/\.x?html?$/, qr/\.ikiwiki-new$/,
-		qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//],
+		qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//,
+		qr/\.dpkg-tmp$/],
 	wiki_link_regexp => qr/\[\[(?:([^\]\|]+)\|)?([^\s\]#]+)(?:#([^\s\]]+))?\]\]/,
 	wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
 	web_commit_regexp => qr/^web commit (by (.*?(?=: |$))|from (\d+\.\d+\.\d+\.\d+)):?(.*)/,
diff --git a/debian/changelog b/debian/changelog
index 20e92c43c..fd5fda596 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,8 +34,10 @@ ikiwiki (1.50) UNRELEASED; urgency=low
     usedirs you'll have to deal with that on upgrade to this version.
   * Add feedshow parameter to inline, which can be useful for eg, removing
     old posts from feeds when permalinks change.
+  * Add .dpkg-tmp to prune regexp, so that if ikiwiki is run right as it's
+    being upgraded by dpkg it will ignore dpkg temp files in the basewiki.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 14 Apr 2007 16:52:46 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 15 Apr 2007 14:09:54 -0400
 
 ikiwiki (1.49) unstable; urgency=low
 
-- 
2.39.5