[SCM] Debian packaging of libhtml-mason-perl branch, master, updated. 2f2cb4119bb0090817006f2bed9f1fb5e8e1bc91

[Florian Schlichting]

The following commit has been merged in the master branch:
commit 2f2cb4119bb0090817006f2bed9f1fb5e8e1bc91
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Mon Sep 19 12:19:36 2011 +0000

    apply patch from BTS so that index.html is shown when / is requested

diff --git a/debian/changelog b/debian/changelog
index c77ffcf..efd2543 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,12 @@ libhtml-mason-perl (1:1.45-2) UNRELEASED; urgency=low
   * debian/copyright: Replace DEP5 Format-Specification URL from
     svn.debian.org to anonscm.debian.org URL.
 
- -- Ansgar Burchardt <ansgar at debian.org>  Wed, 27 Jul 2011 18:44:29 +0200
+  [ Florian Schlichting ]
+  * debian/mason_apache2_example.conf: Apply patch from BTS to work around an
+    Apache2 bug preventing index.html to be shown when the URI specifies a
+    directory (Closes: #451714).  Thanks, Andreas Krueger!
+
+ -- Florian Schlichting <fschlich at zedat.fu-berlin.de>  Mon, 19 Sep 2011 12:05:07 +0000
 
 libhtml-mason-perl (1:1.45-1) unstable; urgency=low
 
diff --git a/debian/mason_apache2_example.conf b/debian/mason_apache2_example.conf
index 60752b6..69b3468 100644
--- a/debian/mason_apache2_example.conf
+++ b/debian/mason_apache2_example.conf
@@ -3,10 +3,12 @@
 <IfModule mod_perl.c>
     PerlModule CGI::Cookie
     <Directory /var/www/mason_example>
-        SetHandler perl-script
-        PerlResponsehandler HTML::Mason::ApacheHandler
-        PerlSetVar MasonArgsMethod CGI
-        # CGI was previously required for Mason to work in Apache2
+        <FilesMatch "\.html$">
+            SetHandler perl-script
+            PerlResponsehandler HTML::Mason::ApacheHandler
+            PerlSetVar MasonArgsMethod CGI
+            # CGI was previously required for Mason to work in Apache2
+        </FilesMatch>
     </Directory>
 
      # This chunk allows concurrent use with mod_perl *or* CGI:

-- 
Debian packaging of libhtml-mason-perl