ship conf.d/apache2-doc

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/branches/etch-apache2@425 01b336ce-410b-0410-9a02-a0e7f243c266

5 files changed, 26 insertions, 4 deletions

diff --git a/debian/NEWS b/debian/NEWS
index 1cf23538..89ffb9a0 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -37,5 +37,9 @@ apache2 (2.2.3-4) stable; urgency=low
 
     http://httpd.apache.org/docs/2.2/upgrading.html
 
+  or, if you have apache2-doc installed and your apache is running, at
+
+    http://localhost/manual/upgrading.html
+
  -- Stefan Fritsch <sf@debian.org>  Sun, 08 Jul 2007 22:07:05 +0200
 
diff --git a/debian/README.Debian b/debian/README.Debian
index 6a9f4020..3b0f92c8 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -9,6 +9,7 @@ Contents
 	
 	Using SSL keys with passwords /	Restarting Apache during logrotate
 
+	Documentation
 
 Apache2 Configuration under Debian GNU/Linux
 ============================================
@@ -119,3 +120,15 @@ stop.
 However, "/etc/init.d/apache2 restart" will not work if you use a SSL key file
 with password. In this case you need to change the "restart" in
 /etc/logrotate.d/apache2 to "reload".
+
+
+Documentation
+=============
+
+The full apache 2 documentation can be found on the web at
+
+http://httpd.apache.org/docs/2.2/
+
+or, if you have installed the apache2-doc package, at
+
+http://localhost/manual/
diff --git a/debian/apache2-doc.conf b/debian/apache2-doc.conf
index a87b79e8..86357496 100644
--- a/debian/apache2-doc.conf
+++ b/debian/apache2-doc.conf
@@ -6,6 +6,7 @@ AliasMatch ^/apache2-default/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ "
     AllowOverride None
     Order allow,deny
     Allow from all
+    AddDefaultCharset off
 
     <Files *.html>
         SetHandler type-map
diff --git a/debian/changelog b/debian/changelog
index 981e6e84..9a39779b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,19 @@
 apache2 (2.2.3-4+etch2) UNRELEASED; urgency=low
 
-  * Security fixes (less critical):
+  * Security fixes:
     - CVE-2006-5752: XSS in mod_status
     - CVE-2007-1863: DoS in mod_cache
   * Add /var/lock/apache2 owner fix to the init script, as /var/lock
     may not persist across reboots.  (Closes: #420101)
-  * Fix regression breaking /etc/init.d/apache when /bin/sh is not bash
+  * Fix regression breaking /etc/init.d/apache2 when /bin/sh is not bash
     (Closes: #430386)
   * Only allow group www-data to execute suexec (Closes: #431048)
   * Display warning when NO_START=1 even with VERBOSE=no, to avoid
     confusion (Closes: #430116)
-  * Add warning about new 2.2 config file syntax and point to upgrading
-    howto.
+  * Unbreak apache2-doc: Ship correct conf.d/apache2-doc and add note how
+    to read the docs in README.Debian (Closes: #285290)
+  * NEWS.Debian: Add warning about new 2.2 config file syntax and point to
+    upgrading howto.
 
  -- Stefan Fritsch <sf@debian.org>  Sat, 23 Jun 2007 10:18:12 +0200
 
diff --git a/debian/rules b/debian/rules
index e92b4d03..78f69907 100755
--- a/debian/rules
+++ b/debian/rules
@@ -171,6 +171,8 @@ install: build install-worker install-prefork install-common install-dev install
 
 	cp debian/bash_completion debian/apache2.2-common/etc/bash_completion.d/apache2.2-common
 
+	cp debian/apache2-doc.conf debian/apache2-doc/etc/apache2/conf.d/apache2-doc
+
 	#apache2-utils extras
 	cp support/check_forensic debian/apache2-utils/usr/sbin/check_forensic
 	cp debian/check_forensic.8 debian/apache2-utils/usr/share/man/man8/check_forensic.8