This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit 484851ed91b9a151aa99100215471abf75015a9b Author: Emmanuel Bourg <[email protected]> Date: Mon Mar 30 17:22:09 2015 +0200 Refreshed the patches --- debian/changelog | 4 +++- .../0004-split-deploy-webapps-target-from-deploy-target.patch | 4 ++-- debian/patches/0005-skip-test-failures.patch | 10 +++++----- debian/patches/0010-debianize-build-xml.patch | 4 ++-- .../0013-dont-look-for-build-properties-in-user-home.patch | 2 +- debian/patches/0019-add-distribution-to-error-page.patch | 2 +- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index adaa37e..c696256 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ -tomcat8 (8.0.18-2) UNRELEASED; urgency=medium +tomcat8 (8.0.21-1) UNRELEASED; urgency=medium + * New upstream release + - Refreshed the patches * debian/orig-tar.sh: Exclude the taglibs-standard-*.jar files from the upstream tarball 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 9b0f76e..cea921f 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 -@@ -990,7 +990,7 @@ +@@ -996,7 +996,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" -@@ -1029,6 +1029,10 @@ +@@ -1035,6 +1035,10 @@ </fileset> </copy> diff --git a/debian/patches/0005-skip-test-failures.patch b/debian/patches/0005-skip-test-failures.patch index f0be66c..3c3ddd3 100644 --- a/debian/patches/0005-skip-test-failures.patch +++ b/debian/patches/0005-skip-test-failures.patch @@ -3,18 +3,18 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -1344,8 +1344,10 @@ +@@ -1379,8 +1379,10 @@ + </filterchain> + </concat> - <target name="test" description="Runs the JUnit test cases" - depends="test-bio,test-nio,test-nio2,test-apr,cobertura-report" > + <!-- - <fail if="test.result.error" message='Some tests completed with an Error. See ${tomcat.build}/logs for details, search for "FAILED".' /> + <fail if="test.result.error" message='Some tests completed with an Error. See ${tomcat.build}/logs for details, search for "ERROR".' /> <fail if="test.result.failure" message='Some tests completed with a Failure. See ${tomcat.build}/logs for details, search for "FAILED".' /> + --> </target> <target name="test-bio" description="Runs the JUnit test cases for BIO. Does not stop on errors." -@@ -1404,7 +1406,7 @@ +@@ -1439,7 +1441,7 @@ <sequential> <mkdir dir="${test.reports}" /> diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch index 08d8c4e..efc5ab4 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 -@@ -641,7 +641,7 @@ +@@ -647,7 +647,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}" -@@ -993,12 +993,14 @@ +@@ -999,12 +999,14 @@ <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples,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 6be79fe..8c6f062 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 -@@ -520,7 +520,6 @@ +@@ -526,7 +526,6 @@ <!-- Property that determines if manifests need updating --> <uptodate property="manifests.uptodate" targetfile="${tomcat.manifests}/default.manifest" > diff --git a/debian/patches/0019-add-distribution-to-error-page.patch b/debian/patches/0019-add-distribution-to-error-page.patch index c35d22d..dfa1e81 100644 --- a/debian/patches/0019-add-distribution-to-error-page.patch +++ b/debian/patches/0019-add-distribution-to-error-page.patch @@ -16,7 +16,7 @@ Bug-Debian: http://bugs.debian.org/729840 \ No newline at end of file --- a/build.xml +++ b/build.xml -@@ -232,6 +232,7 @@ +@@ -237,6 +237,7 @@ <filter token="YEAR" value="${year}"/> <filter token="VERSION" value="${version}"/> <filter token="VERSION_NUMBER" value="${version.number}"/> -- 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
