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

[Arno Töll]

The following commit has been merged in the next branch:
commit 6b3ef9500e654313b742e022ef5020c8744e66a7
Author: Arno Töll <debian at toell.net>
Date:   Tue Feb 28 22:34:05 2012 +0100

    Provide load files for some more new modules
    
    * Provide .load files for all available modules now
    * Delete the watchdog module file - it is enabled statically as that one is
      required to be loaded by some other modules (e.g. heartbeat, heartmonitor)

diff --git a/debian/config-dir/new-mods-available/auth_form.load b/debian/config-dir/mods-available/auth_form.load
similarity index 78%
rename from debian/config-dir/new-mods-available/auth_form.load
rename to debian/config-dir/mods-available/auth_form.load
index fa136e9..35fe905 100644
--- a/debian/config-dir/new-mods-available/auth_form.load
+++ b/debian/config-dir/mods-available/auth_form.load
@@ -1 +1,2 @@
+# Depends: session
 LoadModule auth_form_module /usr/lib/apache2/modules/mod_auth_form.so
diff --git a/debian/config-dir/new-mods-available/authn_core.load b/debian/config-dir/mods-available/authn_core.load
similarity index 100%
rename from debian/config-dir/new-mods-available/authn_core.load
rename to debian/config-dir/mods-available/authn_core.load
diff --git a/debian/config-dir/new-mods-available/authn_socache.load b/debian/config-dir/mods-available/authn_socache.load
similarity index 100%
rename from debian/config-dir/new-mods-available/authn_socache.load
rename to debian/config-dir/mods-available/authn_socache.load
diff --git a/debian/config-dir/new-mods-available/buffer.load b/debian/config-dir/mods-available/buffer.load
similarity index 100%
rename from debian/config-dir/new-mods-available/buffer.load
rename to debian/config-dir/mods-available/buffer.load
diff --git a/debian/config-dir/new-mods-available/dialup.load b/debian/config-dir/mods-available/dialup.load
similarity index 100%
rename from debian/config-dir/new-mods-available/dialup.load
rename to debian/config-dir/mods-available/dialup.load
diff --git a/debian/config-dir/new-mods-available/echo.load b/debian/config-dir/mods-available/echo.load
similarity index 100%
rename from debian/config-dir/new-mods-available/echo.load
rename to debian/config-dir/mods-available/echo.load
diff --git a/debian/config-dir/mods-available/heartbeat.load b/debian/config-dir/mods-available/heartbeat.load
new file mode 100644
index 0000000..208686c
--- /dev/null
+++ b/debian/config-dir/mods-available/heartbeat.load
@@ -0,0 +1,3 @@
+# This module depends on mod_watchdog to be loaded before. In Debian, this
+# module is statically linked.
+LoadModule heartbeat_module /usr/lib/apache2/modules/mod_heartbeat.so
diff --git a/debian/config-dir/mods-available/heartmonitor.load b/debian/config-dir/mods-available/heartmonitor.load
new file mode 100644
index 0000000..e5deba7
--- /dev/null
+++ b/debian/config-dir/mods-available/heartmonitor.load
@@ -0,0 +1,3 @@
+# This module depends on mod_watchdog to be loaded before. In Debian, this
+# module is statically linked.
+LoadModule heartmonitor_module /usr/lib/apache2/modules/mod_heartmonitor.so
diff --git a/debian/config-dir/new-mods-available/lbmethod_bybusyness.load b/debian/config-dir/mods-available/lbmethod_bybusyness.load
similarity index 75%
rename from debian/config-dir/new-mods-available/lbmethod_bybusyness.load
rename to debian/config-dir/mods-available/lbmethod_bybusyness.load
index d6d64b0..f1a4c34 100644
--- a/debian/config-dir/new-mods-available/lbmethod_bybusyness.load
+++ b/debian/config-dir/mods-available/lbmethod_bybusyness.load
@@ -1 +1,2 @@
+# Depends: mod_proxy_balancer
 LoadModule lbmethod_bybusyness_module /usr/lib/apache2/modules/mod_lbmethod_bybusyness.so
diff --git a/debian/config-dir/new-mods-available/lbmethod_byrequests.load b/debian/config-dir/mods-available/lbmethod_byrequests.load
similarity index 75%
rename from debian/config-dir/new-mods-available/lbmethod_byrequests.load
rename to debian/config-dir/mods-available/lbmethod_byrequests.load
index 44661b1..1c987df 100644
--- a/debian/config-dir/new-mods-available/lbmethod_byrequests.load
+++ b/debian/config-dir/mods-available/lbmethod_byrequests.load
@@ -1 +1,2 @@
+# Depends: mod_proxy_balancer
 LoadModule lbmethod_byrequests_module /usr/lib/apache2/modules/mod_lbmethod_byrequests.so
diff --git a/debian/config-dir/new-mods-available/lbmethod_bytraffic.load b/debian/config-dir/mods-available/lbmethod_bytraffic.load
similarity index 74%
rename from debian/config-dir/new-mods-available/lbmethod_bytraffic.load
rename to debian/config-dir/mods-available/lbmethod_bytraffic.load
index 8b234ec..3bf0e88 100644
--- a/debian/config-dir/new-mods-available/lbmethod_bytraffic.load
+++ b/debian/config-dir/mods-available/lbmethod_bytraffic.load
@@ -1 +1,2 @@
+# Depends: mod_proxy_balancer
 LoadModule lbmethod_bytraffic_module /usr/lib/apache2/modules/mod_lbmethod_bytraffic.so
diff --git a/debian/config-dir/new-mods-available/lbmethod_heartbeat.load b/debian/config-dir/mods-available/lbmethod_heartbeat.load
similarity index 74%
rename from debian/config-dir/new-mods-available/lbmethod_heartbeat.load
rename to debian/config-dir/mods-available/lbmethod_heartbeat.load
index d7ece79..6ff5d96 100644
--- a/debian/config-dir/new-mods-available/lbmethod_heartbeat.load
+++ b/debian/config-dir/mods-available/lbmethod_heartbeat.load
@@ -1 +1,2 @@
+# Depends: mod_proxy_balancer
 LoadModule lbmethod_heartbeat_module /usr/lib/apache2/modules/mod_lbmethod_heartbeat.so
diff --git a/debian/config-dir/new-mods-available/sed.load b/debian/config-dir/mods-available/sed.load
similarity index 100%
rename from debian/config-dir/new-mods-available/sed.load
rename to debian/config-dir/mods-available/sed.load
diff --git a/debian/config-dir/new-mods-available/slotmem_plain.load b/debian/config-dir/mods-available/slotmem_plain.load
similarity index 100%
rename from debian/config-dir/new-mods-available/slotmem_plain.load
rename to debian/config-dir/mods-available/slotmem_plain.load
diff --git a/debian/config-dir/new-mods-available/socache_dbm.load b/debian/config-dir/mods-available/socache_dbm.load
similarity index 100%
rename from debian/config-dir/new-mods-available/socache_dbm.load
rename to debian/config-dir/mods-available/socache_dbm.load
diff --git a/debian/config-dir/new-mods-available/socache_memcache.load b/debian/config-dir/mods-available/socache_memcache.load
similarity index 100%
rename from debian/config-dir/new-mods-available/socache_memcache.load
rename to debian/config-dir/mods-available/socache_memcache.load
diff --git a/debian/config-dir/new-mods-available/xml2enc.load b/debian/config-dir/mods-available/xml2enc.load
similarity index 100%
rename from debian/config-dir/new-mods-available/xml2enc.load
rename to debian/config-dir/mods-available/xml2enc.load
diff --git a/debian/config-dir/new-mods-available/heartbeat.load b/debian/config-dir/new-mods-available/heartbeat.load
deleted file mode 100644
index 59d25ce..0000000
--- a/debian/config-dir/new-mods-available/heartbeat.load
+++ /dev/null
@@ -1 +0,0 @@
-LoadModule heartbeat_module /usr/lib/apache2/modules/mod_heartbeat.so
diff --git a/debian/config-dir/new-mods-available/heartmonitor.load b/debian/config-dir/new-mods-available/heartmonitor.load
deleted file mode 100644
index e71423d..0000000
--- a/debian/config-dir/new-mods-available/heartmonitor.load
+++ /dev/null
@@ -1 +0,0 @@
-LoadModule heartmonitor_module /usr/lib/apache2/modules/mod_heartmonitor.so
diff --git a/debian/config-dir/new-mods-available/watchdog.load b/debian/config-dir/new-mods-available/watchdog.load
deleted file mode 100644
index 1fd19ea..0000000
--- a/debian/config-dir/new-mods-available/watchdog.load
+++ /dev/null
@@ -1 +0,0 @@
-LoadModule watchdog_module /usr/lib/apache2/modules/mod_watchdog.so
diff --git a/debian/rules b/debian/rules
index cdc462a..43378c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -110,7 +110,7 @@ override_dh_auto_configure: prepare-custom-suexec suexec-maintainer-scripts
 		--enable-pie \
 		--enable-mpms-shared=all \
 		--enable-mods-shared="all cgi" \
-		--enable-mods-static="unixd logio" \
+		--enable-mods-static="unixd logio watchdog" \
 		CFLAGS="$(AP2_CFLAGS)" CPPFLAGS="$(AP2_CPPFLAGS)" LDFLAGS="$(AP2_LDFLAGS)" \
 		$(AP2_EXTRAFLAGS)
 

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