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 982c5ce0611b07322cee4d0436640f252c3a173c Author: Damien Raude-Morvan <[email protected]> Date: Fri May 18 17:35:01 2012 +0000 * New upstream release. * Revert Apache 2.4 transition (ie. just for wheezy release). * Refresh patches. --- debian/changelog | 6 +++-- debian/patches/0001-disable-logo.patch | 3 --- debian/patches/0002-debianize-log-directory.patch | 26 +++++++++++----------- .../0003-upgrade-info-to-error-message.patch | 2 +- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index 852c5e1..71e5d26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <[email protected]> Fri, 18 May 2012 19:20:50 +0200 diff --git a/debian/patches/0001-disable-logo.patch b/debian/patches/0001-disable-logo.patch index d2d2a8c..c33ffdb 100644 --- a/debian/patches/0001-disable-logo.patch +++ b/debian/patches/0001-disable-logo.patch @@ -6,8 +6,6 @@ Subject: [PATCH] disable logo 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 @@ index 4c44431..fabfd91 100644 <xsl:comment>APACHE LOGO</xsl:comment> <a href="http://www.apache.org/";> --- diff --git a/debian/patches/0002-debianize-log-directory.patch b/debian/patches/0002-debianize-log-directory.patch index 62caff4..7612ece 100644 --- a/debian/patches/0002-debianize-log-directory.patch +++ b/debian/patches/0002-debianize-log-directory.patch @@ -2,19 +2,6 @@ Author: Arnaud Vandyck <[email protected]> Author: Damien Raude-Morvan <[email protected]> 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 @@ Description: Debianize log directory (in source code and default configuration) # 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") diff --git a/debian/patches/0003-upgrade-info-to-error-message.patch b/debian/patches/0003-upgrade-info-to-error-message.patch index 1b058d2..c50c124 100644 --- a/debian/patches/0003-upgrade-info-to-error-message.patch +++ b/debian/patches/0003-upgrade-info-to-error-message.patch @@ -8,7 +8,7 @@ Subject: [PATCH] upgrade info to error message --- 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 { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libapache-mod-jk.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
