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

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit 03a370075dfa8059f4587a0868c8e49768fba7ca
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Mar 31 19:34:44 2012 +0200

    Remove /usr/share/doc alias completely
    
    It has little value and causes more problems than it's worth.

diff --git a/debian/changelog b/debian/changelog
index a63e78c..258c884 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,8 +29,7 @@ apache2 (2.4.1-3) experimental; urgency=low
   [ Stefan Fritsch ]
   * Import lots of bug fixes from upstream svn: All code changes from branch
     2.4.x up to r1307835, plus r1294306 and r1307067 from trunk.
-  * Move /usr/share/doc alias to separate config file and don't enable it
-    by default.
+  * Remove /usr/share/doc alias from default virtual hosts' configs.
 
  -- Arno Töll <debian at toell.net>  Wed, 28 Mar 2012 18:07:18 +0200
 
diff --git a/debian/config-dir/conf-available/alias_usr_share_doc.conf b/debian/config-dir/conf-available/alias_usr_share_doc.conf
deleted file mode 100644
index 6f1c6a6..0000000
--- a/debian/config-dir/conf-available/alias_usr_share_doc.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Alias /doc/ "/usr/share/doc/"
-<Directory "/usr/share/doc/">
-	Options Indexes MultiViews FollowSymLinks
-	AllowOverride None
-	Require local
-</Directory>

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