From fa386be22e019b24bbc7041b9c5028e89a87e0c0 Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sun, 18 Feb 2007 18:01:55 +0000
Subject: [PATCH] * Add explicit module prereqs to Makefile.PL

---
 Makefile.PL                          | 13 +++++++++++++
 debian/changelog                     |  3 ++-
 doc/patchqueue/explicit-prereqs.mdwn | 28 ----------------------------
 3 files changed, 15 insertions(+), 29 deletions(-)
 delete mode 100644 doc/patchqueue/explicit-prereqs.mdwn

diff --git a/Makefile.PL b/Makefile.PL
index cfcc19db7..aaa334062 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -71,4 +71,17 @@ WriteMakefile(
 	PREFIX		=> "/usr/local",
 	PM_FILTER	=> './pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB)',
 	MAN1PODS	=> {},
+	PREREQ_PM	=> {
+		'XML::Simple'		=> 0,
+		'Text::Markdown'	=> 0,
+		'Date::Parse'		=> 0,
+		'HTML::Template'	=> 0,
+		'HTML::Scrubber'	=> 0,
+		'CGI::FormBuilder'	=> 3.02.02,
+		'Time::Duration'	=> 0,
+		'CGI::Session'		=> 0,
+		'Mail::Sendmail'	=> 0,
+		'HTML::Parser'		=> 0,
+		'URI'			=> 0,
+	},
 );
diff --git a/debian/changelog b/debian/changelog
index ee88086ff..53e072b6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,8 +29,9 @@ ikiwiki (1.43) UNRELEASED; urgency=low
   * Avoid potential syslog format string issue, although only older versions
     of perl are vulnerable and it is not known to really be exploitable from
     ikiwiki.
+  * Add explicit module prereqs to Makefile.PL
 
- -- Joey Hess <joeyh@debian.org>  Sat, 17 Feb 2007 16:32:35 -0500
+ -- Joey Hess <joeyh@debian.org>  Sun, 18 Feb 2007 12:58:18 -0500
 
 ikiwiki (1.42) unstable; urgency=low
 
diff --git a/doc/patchqueue/explicit-prereqs.mdwn b/doc/patchqueue/explicit-prereqs.mdwn
deleted file mode 100644
index 033e882fa..000000000
--- a/doc/patchqueue/explicit-prereqs.mdwn
+++ /dev/null
@@ -1,28 +0,0 @@
-You'll might want to make some of these optional, but given the strange behaviour when old versions of certain modules are used, this is a nice sanity check.
-<pre>
-Index: Makefile.PL
-===================================================================
---- Makefile.PL (revision 2626)
-+++ Makefile.PL (working copy)
-@@ -71,4 +71,20 @@
-        PREFIX          => "/usr/local",
-        PM_FILTER       => './pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB)',
-        MAN1PODS        => {},
-+       PREREQ_PM   => {
-+        'Text::Markdown'   => 0,
-+        'URI'              => 0,
-+        'HTML::Parser'     => 0,
-+        'CGI::Session'     => 0,
-+        'CGI::FormBuilder' => 3.02.02,
-+        'Mail::Sendmail'   => 0,
-+        'Time::Duration'   => 0,
-+        'DateTime'         => 0,
-+        'HTML::Scrubber'   => 0,
-+        'RPC::XML'         => 0,
-+        'XML::Simple'      => 0,
-+        'XML::Feed'        => 0,
-+        'File::MimeInfo'   => 0,
-+        'Locale::gettext'  => 1.04
-+    }
- );
-</pre>
\ No newline at end of file
-- 
2.26.2