[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. d75911e8780a2f0875ac462d0544207d9c7e4316

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit d75911e8780a2f0875ac462d0544207d9c7e4316
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Feb 19 19:22:37 2012 +0100

    Add "AddCharset" for .brf files in default mod_mime config.

diff --git a/debian/changelog b/debian/changelog
index 23ba79e..4874b85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -98,6 +98,8 @@ apache2 (2.4.1-1) experimental; urgency=low
   * Use "dh --with autotools_dev" instead of patching config.sub/config.guess.
   * Only include conf.d/*.conf, not conf.d/*.
   * Don't create httpd.conf anymore. (Closes: #639383)
+  * Add "AddCharset" for .brf files in default mod_mime config.
+    (Closes: #402567)
   * Update the README.Debian file
 
  -- Arno Töll <debian at toell.net>  Thu, 16 Feb 2012 21:34:15 +0100
diff --git a/debian/config-dir/mods-available/mime.conf b/debian/config-dir/mods-available/mime.conf
index 331aa3f..ba73f93 100644
--- a/debian/config-dir/mods-available/mime.conf
+++ b/debian/config-dir/mods-available/mime.conf
@@ -206,6 +206,7 @@ AddCharset gb2312      .gb2312 .gb
 AddCharset iso-10646-ucs-2 .ucs-2 .iso-10646-ucs-2
 AddCharset iso-10646-ucs-4 .ucs-4 .iso-10646-ucs-4
 AddCharset shift_jis   .shift_jis .sjis
+AddCharset BRF         .brf
 
 #
 # AddHandler allows you to map certain file extensions to "handlers":

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)