This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat6.
commit 7752cf8e9ae49b38b6c486b5b907c1d55daa12ab Author: Emmanuel Bourg <[email protected]> Date: Mon Feb 17 00:36:44 2014 +0100 New upstream release (6.0.39) Refreshed the patches --- debian/changelog | 4 +++- debian/copyright | 2 +- .../0004-split-deploy-webapps-target-from-deploy-target.patch | 6 +++--- .../patches/0010-Use-java.security.policy-file-in-catalina.sh.patch | 6 +++--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index aa0c724..28c4fdc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -tomcat6 (6.0.37-2) UNRELEASED; urgency=medium +tomcat6 (6.0.39-1) unstable; urgency=medium * Team upload. + * New upstream release. + - Refreshed the patches * Standards-Version updated to 3.9.5 (no changes) * Switch to debhelper level 9 * Use XZ compression for the upstream tarball diff --git a/debian/copyright b/debian/copyright index 12448db..c9cb78a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,7 +9,7 @@ on Tomcat 5.5 and initial packaging by David Pashley <[email protected]>. It was downloaded from http://tomcat.apache.org Copyright: - Copyright (C) 2000-2007 Apache Software Foundation. + Copyright (C) 2000-2014, The Apache Software Foundation. Copyright (C) International Business Machines Corporation 2002 Authors: diff --git a/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch b/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch index eec4257..1dbce8c 100644 --- a/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch +++ b/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch @@ -8,7 +8,7 @@ Subject: [PATCH] split deploy-webapps target from deploy target --- a/build.xml +++ b/build.xml -@@ -486,7 +486,7 @@ +@@ -491,7 +491,7 @@ building a tomcat release.</echo> </target> @@ -17,7 +17,7 @@ Subject: [PATCH] split deploy-webapps target from deploy target <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" file="${tomcat-native.tar.gz}" /> -@@ -523,6 +523,13 @@ +@@ -528,6 +528,13 @@ </fileset> </copy> @@ -31,7 +31,7 @@ Subject: [PATCH] split deploy-webapps target from deploy target <!-- Copy other regular webapps --> <copy todir="${tomcat.build}/webapps"> <fileset dir="webapps"> -@@ -647,10 +654,6 @@ +@@ -652,10 +659,6 @@ </fileset> </txt2html> diff --git a/debian/patches/0010-Use-java.security.policy-file-in-catalina.sh.patch b/debian/patches/0010-Use-java.security.policy-file-in-catalina.sh.patch index c9c3d26..3dd6950 100644 --- a/debian/patches/0010-Use-java.security.policy-file-in-catalina.sh.patch +++ b/debian/patches/0010-Use-java.security.policy-file-in-catalina.sh.patch @@ -14,7 +14,7 @@ Forwarded: not-needed --- a/bin/catalina.sh +++ b/bin/catalina.sh -@@ -271,7 +271,7 @@ +@@ -269,7 +269,7 @@ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -sourcepath "$CATALINA_HOME"/../../java \ -Djava.security.manager \ @@ -23,7 +23,7 @@ Forwarded: not-needed -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ -@@ -298,7 +298,7 @@ +@@ -296,7 +296,7 @@ exec "$_RUNJAVA" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -Djava.security.manager \ @@ -32,7 +32,7 @@ Forwarded: not-needed -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ -@@ -362,7 +362,7 @@ +@@ -360,7 +360,7 @@ "$_RUNJAVA" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -Djava.security.manager \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat6.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
