[pkg-java] r2571 - in trunk/libapache-mod-jk/debian: . patches

[Arnaud Vandyck]

Author: avdyk
Date: 2006-10-09 13:52:09 +0000 (Mon, 09 Oct 2006)
New Revision: 2571

Added:
   trunk/libapache-mod-jk/debian/patches/03_jk-runtime-status_default_location.dpatch
Modified:
   trunk/libapache-mod-jk/debian/changelog
   trunk/libapache-mod-jk/debian/control
   trunk/libapache-mod-jk/debian/patches/00list
Log:
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

Modified: trunk/libapache-mod-jk/debian/changelog
===================================================================
--- trunk/libapache-mod-jk/debian/changelog	2006-10-09 13:11:40 UTC (rev 2570)
+++ trunk/libapache-mod-jk/debian/changelog	2006-10-09 13:52:09 UTC (rev 2571)
@@ -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

Modified: trunk/libapache-mod-jk/debian/control
===================================================================
--- trunk/libapache-mod-jk/debian/control	2006-10-09 13:11:40 UTC (rev 2570)
+++ trunk/libapache-mod-jk/debian/control	2006-10-09 13:52:09 UTC (rev 2571)
@@ -28,7 +28,7 @@
 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

Modified: trunk/libapache-mod-jk/debian/patches/00list
===================================================================
--- trunk/libapache-mod-jk/debian/patches/00list	2006-10-09 13:11:40 UTC (rev 2570)
+++ trunk/libapache-mod-jk/debian/patches/00list	2006-10-09 13:52:09 UTC (rev 2571)
@@ -1 +1,2 @@
 02_style_xsl
+03_jk-runtime-status_default_location.dpatch

Added: trunk/libapache-mod-jk/debian/patches/03_jk-runtime-status_default_location.dpatch
===================================================================
--- trunk/libapache-mod-jk/debian/patches/03_jk-runtime-status_default_location.dpatch	                        (rev 0)
+++ trunk/libapache-mod-jk/debian/patches/03_jk-runtime-status_default_location.dpatch	2006-10-09 13:52:09 UTC (rev 2571)
@@ -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,