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

[Damien Raude-Morvan]

Author: drazzib
Date: 2012-05-18 17:35:01 +0000 (Fri, 18 May 2012)
New Revision: 16057

Modified:
   trunk/libapache-mod-jk/debian/changelog
   trunk/libapache-mod-jk/debian/patches/0001-disable-logo.patch
   trunk/libapache-mod-jk/debian/patches/0002-debianize-log-directory.patch
   trunk/libapache-mod-jk/debian/patches/0003-upgrade-info-to-error-message.patch
Log:
* New upstream release.
* Revert Apache 2.4 transition (ie. just for wheezy release).
* Refresh patches.

Modified: trunk/libapache-mod-jk/debian/changelog
===================================================================
--- trunk/libapache-mod-jk/debian/changelog	2012-05-18 17:26:45 UTC (rev 16056)
+++ trunk/libapache-mod-jk/debian/changelog	2012-05-18 17:35:01 UTC (rev 16057)
@@ -1,6 +1,8 @@
-libapache-mod-jk (1:1.2.35-2) UNRELEASED; urgency=low
+libapache-mod-jk (1:1.2.36-1) unstable; urgency=low
 
-  * Revert Apache 2.4 transition.
+  * New upstream release.
+  * Revert Apache 2.4 transition (ie. just for wheezy release).
+  * Refresh patches.
 
  -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 18 May 2012 19:20:50 +0200
 

Modified: trunk/libapache-mod-jk/debian/patches/0001-disable-logo.patch
===================================================================
--- trunk/libapache-mod-jk/debian/patches/0001-disable-logo.patch	2012-05-18 17:26:45 UTC (rev 16056)
+++ trunk/libapache-mod-jk/debian/patches/0001-disable-logo.patch	2012-05-18 17:35:01 UTC (rev 16057)
@@ -6,8 +6,6 @@
  xdocs/style.xsl |    8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/xdocs/style.xsl b/xdocs/style.xsl
-index 4c44431..fabfd91 100644
 --- a/xdocs/style.xsl
 +++ b/xdocs/style.xsl
 @@ -93,15 +93,15 @@
@@ -30,4 +28,3 @@
  
            <xsl:comment>APACHE LOGO</xsl:comment>
            <a href="http://www.apache.org/">
--- 

Modified: trunk/libapache-mod-jk/debian/patches/0002-debianize-log-directory.patch
===================================================================
--- trunk/libapache-mod-jk/debian/patches/0002-debianize-log-directory.patch	2012-05-18 17:26:45 UTC (rev 16056)
+++ trunk/libapache-mod-jk/debian/patches/0002-debianize-log-directory.patch	2012-05-18 17:35:01 UTC (rev 16057)
@@ -2,19 +2,6 @@
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Last-Update: 2011-07-13 
 Description: Debianize log directory (in source code and default configuration)
---- a/native/apache-2.0/mod_jk.c
-+++ b/native/apache-2.0/mod_jk.c
-@@ -98,8 +98,8 @@
- #include "jk_shm.h"
- #include "jk_url.h"
- 
--#define JK_LOG_DEF_FILE             ("logs/mod_jk.log")
--#define JK_SHM_DEF_FILE             ("logs/jk-runtime-status")
-+#define JK_LOG_DEF_FILE             ("/var/log/apache2/mod_jk.log")
-+#define JK_SHM_DEF_FILE             ("/var/log/apache2/jk-runtime-status")
- #define JK_ENV_REMOTE_ADDR          ("JK_REMOTE_ADDR")
- #define JK_ENV_REMOTE_PORT          ("JK_REMOTE_PORT")
- #define JK_ENV_REMOTE_HOST          ("JK_REMOTE_HOST")
 --- a/conf/httpd-jk.conf
 +++ b/conf/httpd-jk.conf
 @@ -16,26 +16,21 @@
@@ -47,3 +34,16 @@
  
      # Define a new log format you can use in any CustomLog in order
      # to add mod_jk specific information to your access log.
+--- a/native/apache-2.0/mod_jk.c
++++ b/native/apache-2.0/mod_jk.c
+@@ -98,8 +98,8 @@
+ #include "jk_shm.h"
+ #include "jk_url.h"
+ 
+-#define JK_LOG_DEF_FILE             ("logs/mod_jk.log")
+-#define JK_SHM_DEF_FILE             ("logs/jk-runtime-status")
++#define JK_LOG_DEF_FILE             ("/var/log/apache2/mod_jk.log")
++#define JK_SHM_DEF_FILE             ("/var/log/apache2/jk-runtime-status")
+ #define JK_ENV_REMOTE_ADDR          ("JK_REMOTE_ADDR")
+ #define JK_ENV_REMOTE_PORT          ("JK_REMOTE_PORT")
+ #define JK_ENV_REMOTE_HOST          ("JK_REMOTE_HOST")

Modified: trunk/libapache-mod-jk/debian/patches/0003-upgrade-info-to-error-message.patch
===================================================================
--- trunk/libapache-mod-jk/debian/patches/0003-upgrade-info-to-error-message.patch	2012-05-18 17:26:45 UTC (rev 16056)
+++ trunk/libapache-mod-jk/debian/patches/0003-upgrade-info-to-error-message.patch	2012-05-18 17:35:01 UTC (rev 16057)
@@ -8,7 +8,7 @@
 
 --- a/native/apache-2.0/mod_jk.c
 +++ b/native/apache-2.0/mod_jk.c
-@@ -2683,7 +2683,7 @@
+@@ -2793,7 +2793,7 @@
              }
          }
          else {