This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit 5abdac02e57a1e93f70aa8bba6198b0f38c2460b Author: Emmanuel Bourg <[email protected]> Date: Tue Oct 22 10:22:00 2013 +0200 New upstream release (8.0.0-RC5) Refreshed the patches --- debian/changelog | 4 ++-- ...plit-deploy-webapps-target-from-deploy-target.patch | 4 ++-- debian/patches/0005-skip-test-failures.patch | 4 ++-- .../0006-add-JARs-below-var-to-class-loader.patch | 16 ++++++++-------- ...-Use-java.security.policy-file-in-catalina.sh.patch | 6 +++--- debian/patches/0010-debianize-build-xml.patch | 4 ++-- ...3-dont-look-for-build-properties-in-user-home.patch | 2 +- debian/patches/0018-fix-manager-webapp.patch | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index 59d4f3d..9ee056f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -tomcat8 (8.0.0~RC3-1) UNRELEASED; urgency=low +tomcat8 (8.0.0~RC5-1) UNRELEASED; urgency=low * Team upload. * New upstream release (Closes: #722675) @@ -41,7 +41,7 @@ tomcat8 (8.0.0~RC3-1) UNRELEASED; urgency=low * Removed 0011-fix-classpath-lintian-warnings.patch and specified the classpath of jasper.jar in libtomcat8-java.manifest instead. - -- Emmanuel Bourg <[email protected]> Thu, 12 Sep 2013 16:10:10 +0200 + -- Emmanuel Bourg <[email protected]> Tue, 22 Oct 2013 10:11:08 +0200 tomcat7 (7.0.42-2) UNRELEASED; urgency=low 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 6a141c3..6e7987a 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 @@ -3,7 +3,7 @@ Date: Mon, 28 Jun 2010 21:32:35 +0200 Subject: [PATCH] split deploy-webapps target from deploy target --- a/build.xml +++ b/build.xml -@@ -931,7 +931,7 @@ +@@ -944,7 +944,7 @@ </xslt> </target> @@ -12,7 +12,7 @@ Subject: [PATCH] split deploy-webapps target from deploy target description="Default. Builds a working Tomcat instance"> <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" -@@ -969,6 +969,10 @@ +@@ -982,6 +982,10 @@ </fileset> </copy> diff --git a/debian/patches/0005-skip-test-failures.patch b/debian/patches/0005-skip-test-failures.patch index 2a85d55..84d7bcc 100644 --- a/debian/patches/0005-skip-test-failures.patch +++ b/debian/patches/0005-skip-test-failures.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -1255,8 +1255,10 @@ +@@ -1268,8 +1268,10 @@ <target name="test" description="Runs the JUnit test cases" depends="test-bio,test-nio,test-apr" > @@ -14,7 +14,7 @@ Forwarded: not-needed </target> <target name="test-bio" description="Runs the JUnit test cases for BIO. Does not stop on errors." -@@ -1292,7 +1294,7 @@ +@@ -1305,7 +1307,7 @@ description="The extension to use to distinguish the output"/> <sequential> diff --git a/debian/patches/0006-add-JARs-below-var-to-class-loader.patch b/debian/patches/0006-add-JARs-below-var-to-class-loader.patch index 3c4e472..5e51241 100644 --- a/debian/patches/0006-add-JARs-below-var-to-class-loader.patch +++ b/debian/patches/0006-add-JARs-below-var-to-class-loader.patch @@ -3,16 +3,16 @@ Date: Mon, 28 Jun 2010 21:32:57 +0200 Subject: [PATCH] add JARs below /var to class loader --- a/conf/catalina.properties +++ b/conf/catalina.properties -@@ -44,7 +44,7 @@ - # "foo/*.jar": Add all the JARs of the specified folder as class - # repositories - # "foo/bar.jar": Add bar.jar as a class repository --common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar -+common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,${catalina.home}/common/classes,${catalina.home}/common/*.jar +@@ -47,7 +47,7 @@ + # + # Note: Values are enclosed in double quotes ("...") in case either the + # ${catalina.base} path or the ${catalina.home} path contains a comma. +-common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar" ++common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","${catalina.home}/common/classes","${catalina.home}/common/*.jar" # # List of comma-separated paths defining the contents of the "server" -@@ -57,7 +57,7 @@ +@@ -60,7 +60,7 @@ # "foo/*.jar": Add all the JARs of the specified folder as class # repositories # "foo/bar.jar": Add bar.jar as a class repository @@ -21,7 +21,7 @@ Subject: [PATCH] add JARs below /var to class loader # # List of comma-separated paths defining the contents of the "shared" -@@ -71,7 +71,7 @@ +@@ -74,7 +74,7 @@ # "foo/bar.jar": Add bar.jar as a class repository # Please note that for single jars, e.g. bar.jar, you need the URL form # starting with file:. diff --git a/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch b/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch index 1da8d66..ef85a4d 100644 --- a/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch +++ b/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch @@ -9,7 +9,7 @@ Bug-Debian: http://bugs.debian.org/585379 Forwarded: not-needed --- a/bin/catalina.sh +++ b/bin/catalina.sh -@@ -285,7 +285,7 @@ +@@ -299,7 +299,7 @@ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -sourcepath "$CATALINA_HOME"/../../java \ -Djava.security.manager \ @@ -18,7 +18,7 @@ Forwarded: not-needed -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ -@@ -312,7 +312,7 @@ +@@ -326,7 +326,7 @@ eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ -Djava.security.manager \ @@ -27,7 +27,7 @@ Forwarded: not-needed -Dcatalina.base="\"$CATALINA_BASE\"" \ -Dcatalina.home="\"$CATALINA_HOME\"" \ -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ -@@ -376,7 +376,7 @@ +@@ -390,7 +390,7 @@ eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ -Djava.security.manager \ diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch index 7f2ee2d..6599dbb 100644 --- a/debian/patches/0010-debianize-build-xml.patch +++ b/debian/patches/0010-debianize-build-xml.patch @@ -5,7 +5,7 @@ Last-Update: 2011-05-16 --- a/build.xml +++ b/build.xml -@@ -603,7 +603,7 @@ +@@ -604,7 +604,7 @@ </copy> </target> @@ -14,7 +14,7 @@ Last-Update: 2011-05-16 <!-- Compile internal server components --> <javac srcdir="java" destdir="${tomcat.classes}" debug="${compile.debug}" -@@ -934,12 +934,14 @@ +@@ -947,12 +947,14 @@ <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,deploy-webapps" description="Default. Builds a working Tomcat instance"> diff --git a/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch b/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch index 8c81afe..cb3ca94 100644 --- a/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch +++ b/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch @@ -3,7 +3,7 @@ Date: Mon, 9 Jul 2012 20:53:38 +0000 Subject: 0013-dont-look-for-build-properties-in-user-home --- a/build.xml +++ b/build.xml -@@ -475,7 +475,6 @@ +@@ -476,7 +476,6 @@ <!-- Property that determines if manifests need updating --> <uptodate property="manifests.uptodate" targetfile="${tomcat.manifests}/default.manifest" > diff --git a/debian/patches/0018-fix-manager-webapp.patch b/debian/patches/0018-fix-manager-webapp.patch index 78ef7a6..b044b13 100644 --- a/debian/patches/0018-fix-manager-webapp.patch +++ b/debian/patches/0018-fix-manager-webapp.patch @@ -28,7 +28,7 @@ Last-Update: 2013-08-01 </Context>]]></source> --- a/conf/catalina.policy +++ b/conf/catalina.policy -@@ -202,14 +202,14 @@ +@@ -203,14 +203,14 @@ // - default CATALINA_HOME == CATALINA_BASE // - CATALINA_HOME != CATALINA_BASE, per instance Manager in CATALINA_BASE // - CATALINA_HOME != CATALINA_BASE, shared Manager in CATALINA_HOME -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
