Fix 676641 by merging the patch supplied by Denis Laxalde

16 files changed, 19 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index e974f2b..2a3ec4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 lighttpd (1.4.31-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Fix "configuration files refer to wrong path for documentation"
+    by merging a patch supplied by  Denis Laxalde <denis@laxalde.org>
+     (Closes: #676641)
 
- -- Arno Töll <arno@debian.org>  Sat, 02 Jun 2012 00:43:11 +0200
+ -- Arno Töll <arno@debian.org>  Wed, 13 Jun 2012 01:28:28 +0200
 
 lighttpd (1.4.31-1) unstable; urgency=low
 
diff --git a/debian/conf-available/05-auth.conf b/debian/conf-available/05-auth.conf
index 5d896e3..6c14e47 100644
--- a/debian/conf-available/05-auth.conf
+++ b/debian/conf-available/05-auth.conf
@@ -1,4 +1,4 @@
-# /usr/share/doc/lighttpd-doc/authentication.txt.gz
+# /usr/share/doc/lighttpd/authentication.txt.gz
 
 server.modules                += ( "mod_auth" )
 
diff --git a/debian/conf-available/10-cgi.conf b/debian/conf-available/10-cgi.conf
index 8045b0d..1e93a11 100644
--- a/debian/conf-available/10-cgi.conf
+++ b/debian/conf-available/10-cgi.conf
@@ -1,4 +1,4 @@
-# /usr/share/doc/lighttpd-doc/cgi.txt
+# /usr/share/doc/lighttpd/cgi.txt
 
 server.modules += ( "mod_cgi" )
 
diff --git a/debian/conf-available/10-fastcgi.conf b/debian/conf-available/10-fastcgi.conf
index 8171355..7862ed9 100644
--- a/debian/conf-available/10-fastcgi.conf
+++ b/debian/conf-available/10-fastcgi.conf
@@ -1,4 +1,4 @@
-# /usr/share/doc/lighttpd-doc/fastcgi.txt.gz
+# /usr/share/doc/lighttpd/fastcgi.txt.gz
 # http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ConfigurationOptions#mod_fastcgi-fastcgi
 
 server.modules += ( "mod_fastcgi" )
diff --git a/debian/conf-available/10-proxy.conf b/debian/conf-available/10-proxy.conf
index b545a4f..1e95945 100644
--- a/debian/conf-available/10-proxy.conf
+++ b/debian/conf-available/10-proxy.conf
@@ -1,4 +1,4 @@
-# /usr/share/doc/lighttpd-doc/proxy.txt
+# /usr/share/doc/lighttpd/proxy.txt
 
 server.modules   += ( "mod_proxy" )
 
diff --git a/debian/conf-available/10-rrdtool.conf b/debian/conf-available/10-rrdtool.conf
index f8befc1..0a49c98 100644
--- a/debian/conf-available/10-rrdtool.conf
+++ b/debian/conf-available/10-rrdtool.conf
@@ -1,4 +1,4 @@
-# /usr/share/doc/lighttpd-doc/rrdtool.txt
+# /usr/share/doc/lighttpd/rrdtool.txt
 
 server.modules += ( "mod_rrdtool" )
 
diff --git a/debian/conf-available/10-simple-vhost.conf b/debian/conf-available/10-simple-vhost.conf
index e35eca4..7dfa1ca 100644
--- a/debian/conf-available/10-simple-vhost.conf
+++ b/debian/conf-available/10-simple-vhost.conf
@@ -1,4 +1,4 @@
-# /usr/share/doc/lighttpd-doc/simple-vhost.txt
+# /usr/share/doc/lighttpd/simple-vhost.txt
 
 server.modules += ( "mod_simple_vhost" )
 
diff --git a/debian/conf-available/10-ssi.conf b/debian/conf-available/10-ssi.conf
index 5532319..55d2aba 100644
--- a/debian/conf-available/10-ssi.conf
+++ b/debian/conf-available/10-ssi.conf
@@ -1,4 +1,4 @@
-# /usr/share/doc/lighttpd-doc/ssi.txt
+# /usr/share/doc/lighttpd/ssi.txt
 
 server.modules += ( "mod_ssi" )
 
diff --git a/debian/conf-available/10-ssl.conf b/debian/conf-available/10-ssl.conf
index 34f3912..6bb602a 100644
--- a/debian/conf-available/10-ssl.conf
+++ b/debian/conf-available/10-ssl.conf
@@ -1,4 +1,4 @@
-# /usr/share/doc/lighttpd-doc/ssl.txt
+# /usr/share/doc/lighttpd/ssl.txt
 
 $SERVER["socket"] == "0.0.0.0:443" {
 	ssl.engine  = "enable"
diff --git a/debian/conf-available/10-status.conf b/debian/conf-available/10-status.conf
index f8b698f..2859372 100644
--- a/debian/conf-available/10-status.conf
+++ b/debian/conf-available/10-status.conf
@@ -1,4 +1,4 @@
-# /usr/share/doc/lighttpd-doc/status.txt
+# /usr/share/doc/lighttpd/status.txt
 # http://trac.lighttpd.net/trac/wiki/Docs%3AModStatus
 
 server.modules += ( "mod_status" )
diff --git a/debian/conf-available/10-userdir.conf b/debian/conf-available/10-userdir.conf
index 459bbe7..3507eaf 100644
--- a/debian/conf-available/10-userdir.conf
+++ b/debian/conf-available/10-userdir.conf
@@ -1,7 +1,7 @@
 ## The userdir module provides a simple way to link user-based directories into
 ## the global namespace of the webserver.
 ##
-# /usr/share/doc/lighttpd-doc/userdir.txt
+# /usr/share/doc/lighttpd/userdir.txt
 
 server.modules      += ( "mod_userdir" )
 
diff --git a/debian/conf-available/15-fastcgi-php.conf b/debian/conf-available/15-fastcgi-php.conf
index 9f9f04e..60822a9 100644
--- a/debian/conf-available/15-fastcgi-php.conf
+++ b/debian/conf-available/15-fastcgi-php.conf
@@ -1,5 +1,5 @@
 # -*- depends: fastcgi -*-
-# /usr/share/doc/lighttpd-doc/fastcgi.txt.gz
+# /usr/share/doc/lighttpd/fastcgi.txt.gz
 # http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ConfigurationOptions#mod_fastcgi-fastcgi
 
 ## Start an FastCGI server for php (needs the php5-cgi package)
diff --git a/debian/conf-available2/10-cml.conf b/debian/conf-available2/10-cml.conf
index e9a7735..9ff3903 100644
--- a/debian/conf-available2/10-cml.conf
+++ b/debian/conf-available2/10-cml.conf
@@ -2,7 +2,7 @@
 ## at one side and building a page from its fragments on the 
 ## other side using LUA.
 ##
-## /usr/share/doc/lighttpd-doc/cml.txt
+## /usr/share/doc/lighttpd/cml.txt
 
 server.modules += ( "mod_cml" )
 
diff --git a/debian/conf-available2/10-magnet.conf b/debian/conf-available2/10-magnet.conf
index 32993f7..9f166c6 100644
--- a/debian/conf-available2/10-magnet.conf
+++ b/debian/conf-available2/10-magnet.conf
@@ -1,4 +1,4 @@
-# /usr/share/doc/lighttpd-doc/magnet.txt.gz
+# /usr/share/doc/lighttpd/magnet.txt.gz
 # http://trac.lighttpd.net/trac/wiki/Docs%3AModMagnet
 
 server.modules += ( "mod_magnet" )
diff --git a/debian/conf-available2/10-trigger-b4-dl.conf b/debian/conf-available2/10-trigger-b4-dl.conf
index 02ff589..f145ff2 100644
--- a/debian/conf-available2/10-trigger-b4-dl.conf
+++ b/debian/conf-available2/10-trigger-b4-dl.conf
@@ -1,6 +1,6 @@
 ## A module to prevent deep-linking from other sites.
 ## 
-# /usr/share/doc/lighttpd-doc/trigger-b4-dl.html
+# /usr/share/doc/lighttpd/trigger-b4-dl.html
 
 server.modules += ( "mod_trigger_b4_dl" )
 
diff --git a/debian/conf-available2/10-webdav.conf b/debian/conf-available2/10-webdav.conf
index 167170d..7d4897f 100644
--- a/debian/conf-available2/10-webdav.conf
+++ b/debian/conf-available2/10-webdav.conf
@@ -3,7 +3,7 @@
 ## the group defined which allows users to collaboratively edit and manage
 ## files on remote web servers.
 ##
-# /usr/share/doc/lighttpd-doc/webdav.txt
+# /usr/share/doc/lighttpd/webdav.txt
 # http://trac.lighttpd.net/trac/wiki/Docs%3AModWebDAV
 
 server.modules += ( "mod_webdav" )