summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Fritsch <sf@debian.org>2008-09-07 15:36:53 +0000
committerStefan Fritsch <sf@sfritsch.de>2012-01-02 10:36:57 +0100
commitfe0787ada01c8444afe24e22a937f2b795a9bad6 (patch)
tree9a3d82423018c0a602b46450c92a0101bfe1087a
parent3fbca00e71fa622638254cf47483449413b0c621 (diff)
downloadapache2-fe0787ada01c8444afe24e22a937f2b795a9bad6.tar.gz
Fix Spanish language support
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@815 01b336ce-410b-0410-9a02-a0e7f243c266
-rw-r--r--debian/changelog2
-rw-r--r--debian/config-dir/mods-available/mime.conf2
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index ed4857b4..e96ca7b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
apache2 (2.2.9-8) UNRELEASED; urgency=low
+ * Fix Spanish language support which was broken by .es being added to /etc/mime.types for
+ application/ecmascript. (Closes: #496080)
* Correct description of ServerTokens in /etc/apache2/conf.d/security.
(Closes: #497362)
* Specify DocumentRoot without trailing slash. (Closes: #495110)
diff --git a/debian/config-dir/mods-available/mime.conf b/debian/config-dir/mods-available/mime.conf
index 77a75b02..5404fe4c 100644
--- a/debian/config-dir/mods-available/mime.conf
+++ b/debian/config-dir/mods-available/mime.conf
@@ -73,6 +73,8 @@ AddLanguage de .de
AddLanguage el .el
AddLanguage en .en
AddLanguage eo .eo
+# remove conflicting type application/ecmascript from .es
+RemoveType es
AddLanguage es .es
AddLanguage et .et
AddLanguage fr .fr