[libapache-mod-jk] 07/65: libapache-mod-jk (1:1.2.18-2) unstable; urgency=low

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository libapache-mod-jk.

commit 496d53ade5a9947c4d593163a3c8b1c555fc194a
Author: Arnaud Vandyck <avdyk at debian.org>
Date:   Mon Oct 9 13:52:09 2006 +0000

    libapache-mod-jk (1:1.2.18-2) unstable; urgency=low
    
      * debian/control (Depends): updated to apache2.2-common (closes:
        #391651), thanks to Philippe Marzouk.
      * debian/patches/03_jk-runtime-status_default_location.dpatch:
        added. This change the default location of JkShmFile variable (closes:
        #362004), thanks to Adrian Bridgett.
    
     -- Arnaud Vandyck <avdyk at debian.org>  Mon,  9 Oct 2006 15:41:47 +0200
---
 debian/changelog                                      | 10 ++++++++++
 debian/control                                        |  2 +-
 debian/patches/00list                                 |  1 +
 .../03_jk-runtime-status_default_location.dpatch      | 19 +++++++++++++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b61ad68..92f811b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libapache-mod-jk (1:1.2.18-2) unstable; urgency=low
+
+  * debian/control (Depends): updated to apache2.2-common (closes:
+    #391651), thanks to Philippe Marzouk.
+  * debian/patches/03_jk-runtime-status_default_location.dpatch:
+    added. This change the default location of JkShmFile variable (closes:
+    #362004), thanks to Adrian Bridgett.
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Mon,  9 Oct 2006 15:41:47 +0200
+
 libapache-mod-jk (1:1.2.18-1) unstable; urgency=low
 
   * New upstream
diff --git a/debian/control b/debian/control
index 640e94c..477a05e 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Package: libapache2-mod-jk
 Architecture: any
 Section: web
 Priority: optional
-Depends: ${shlibs:Depends}, apache2-common, apache2
+Depends: ${shlibs:Depends}, apache2.2-common, apache2
 Suggests: tomcat4 | tomcat5, libapache-mod-jk-doc
 Conflicts: libapache2-mod-jk2
 Replaces: libapache2-mod-jk2
diff --git a/debian/patches/00list b/debian/patches/00list
index d56213a..27bdfd1 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +1,2 @@
 02_style_xsl
+03_jk-runtime-status_default_location.dpatch
diff --git a/debian/patches/03_jk-runtime-status_default_location.dpatch b/debian/patches/03_jk-runtime-status_default_location.dpatch
new file mode 100644
index 0000000..5977cb7
--- /dev/null
+++ b/debian/patches/03_jk-runtime-status_default_location.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_jk-runtime-statuts_default_location.dpatch by Arnaud Vandyck <avdyk at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: commented some errors in the stylesheet
+
+ at DPATCH@
+
+--- ./native/apache-2.0/mod_jk.c~	2006-07-08 07:57:31.000000000 +0000
++++ ./native/apache-2.0/mod_jk.c	2006-10-09 08:19:21.000000000 +0000
+@@ -2342,7 +2342,7 @@
+ 
+ #if !defined(WIN32) && !defined(NETWARE)
+     if (!jk_shm_file) {
+-        jk_shm_file = ap_server_root_relative(pconf, "logs/jk-runtime-status");
++        jk_shm_file = ap_server_root_relative(pconf, "/var/log/apache2/jk-runtime-status");
+         if (jk_shm_file)
+             ap_log_error(APLOG_MARK, APLOG_INFO | APLOG_NOERRNO,
+                          0, NULL,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libapache-mod-jk.git