[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, master, updated. debian/2.2.22-3-13-g4a6bd73

[Stefan Fritsch]

The following commit has been merged in the master branch:
commit 251abba3e5fdc2fa13f2a3a93783af6d389735f8
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon May 28 20:23:03 2012 +0200

    Change compiled-in document root to /var/www
    
    to avoid strange error messages
    
    also refresh patch

diff --git a/debian/changelog b/debian/changelog
index 43ca794..ac1b8ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ apache2 (2.2.22-6) UNRELEASED; urgency=low
 
   [ Stefan Fritsch ]
   * Use "dh --with autotools_dev" instead of patching config.sub/config.guess.
+  * Change compiled-in document root to /var/www, to avoid strange error
+    messages.
 
  -- Stefan Fritsch <sf at debian.org>  Mon, 28 May 2012 20:02:19 +0200
 
diff --git a/debian/patches/010_fhs_compliance b/debian/patches/010_fhs_compliance
index 96bbb99..f2261df 100644
--- a/debian/patches/010_fhs_compliance
+++ b/debian/patches/010_fhs_compliance
@@ -5,8 +5,10 @@
 ## DP: Fix up FHS file locations for apache2 droppings.
 
 @DPATCH@
---- a/config.layout
-+++ b/config.layout
+Index: apache2/config.layout
+===================================================================
+--- apache2.orig/config.layout
++++ apache2/config.layout
 @@ -314,11 +314,11 @@
      manualdir:     ${htdocsdir}/manual
      cgidir:        ${prefix}/usr/lib/cgi-bin
@@ -22,8 +24,10 @@
 +    installbuilddir: ${prefix}/usr/share/apache2/build
      errordir:      ${datadir}/error
  </Layout>
---- a/configure
-+++ b/configure
+Index: apache2/configure
+===================================================================
+--- apache2.orig/configure
++++ apache2/configure
 @@ -19110,17 +19110,17 @@
  
  
@@ -45,8 +49,10 @@
  _ACEOF
  
  
---- a/configure.in
-+++ b/configure.in
+Index: apache2/configure.in
+===================================================================
+--- apache2.orig/configure.in
++++ apache2/configure.in
 @@ -665,11 +665,11 @@
  echo $MODLIST | $AWK -f $srcdir/build/build-modules-c.awk > modules.c
  
@@ -62,8 +68,10 @@
  	[Location of the MIME types config file, relative to the Apache root directory])
  AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR",
  	[Location of the source for the current MPM])
---- a/include/ap_config_layout.h.in
-+++ b/include/ap_config_layout.h.in
+Index: apache2/include/ap_config_layout.h.in
+===================================================================
+--- apache2.orig/include/ap_config_layout.h.in
++++ apache2/include/ap_config_layout.h.in
 @@ -60,5 +60,6 @@
  #define DEFAULT_REL_LOGFILEDIR "@rel_logfiledir@"
  #define DEFAULT_EXP_PROXYCACHEDIR "@exp_proxycachedir@"
@@ -71,3 +79,16 @@
 +#define DEFAULT_PIDLOG "/var/run/apache2.pid"
  
  #endif /* AP_CONFIG_LAYOUT_H */
+Index: apache2/include/httpd.h
+===================================================================
+--- apache2.orig/include/httpd.h
++++ apache2/include/httpd.h
+@@ -112,7 +112,7 @@
+ #define DOCUMENT_LOCATION  HTTPD_ROOT "/docs"
+ #else
+ /* Set default for non OS/2 file system */
+-#define DOCUMENT_LOCATION  HTTPD_ROOT "/htdocs"
++#define DOCUMENT_LOCATION  "/var/www"
+ #endif
+ #endif /* DOCUMENT_LOCATION */
+ 

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