This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit b96123272f3ca36aca00fa60b9374e37c024e9a6 Author: Emmanuel Bourg <[email protected]> Date: Mon Dec 8 23:58:55 2014 +0100 Refreshed the patches --- debian/changelog | 7 +++++++ .../0004-split-deploy-webapps-target-from-deploy-target.patch | 2 +- debian/patches/0005-skip-test-failures.patch | 4 ++-- debian/patches/0010-debianize-build-xml.patch | 4 ++-- .../patches/0013-dont-look-for-build-properties-in-user-home.patch | 2 +- debian/patches/0019-add-distribution-to-error-page.patch | 4 ++-- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 59a638c..4e3e826 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +tomcat8 (8.0.15-1) UNRELEASED; urgency=medium + + * New upstream release + - Refreshed the patches + + -- Emmanuel Bourg <[email protected]> Mon, 08 Dec 2014 23:51:13 +0100 + tomcat8 (8.0.14-1) unstable; urgency=medium * New upstream release 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 9e42dd1..dfdb1aa 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 -@@ -989,7 +989,7 @@ +@@ -988,7 +988,7 @@ </xslt> </target> diff --git a/debian/patches/0005-skip-test-failures.patch b/debian/patches/0005-skip-test-failures.patch index 4324b72..44a586f 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 -@@ -1339,8 +1339,10 @@ +@@ -1342,8 +1342,10 @@ <target name="test" description="Runs the JUnit test cases" depends="test-bio,test-nio,test-nio2,test-apr,cobertura-report" > @@ -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." -@@ -1399,7 +1401,7 @@ +@@ -1402,7 +1404,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 5679976..e4370ba 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 -@@ -640,7 +640,7 @@ +@@ -639,7 +639,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}" -@@ -992,12 +992,14 @@ +@@ -991,12 +991,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 7743212..1ab43bf 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 -@@ -519,7 +519,6 @@ +@@ -518,7 +518,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 d628e7d..c35d22d 100644 --- a/debian/patches/0019-add-distribution-to-error-page.patch +++ b/debian/patches/0019-add-distribution-to-error-page.patch @@ -16,11 +16,11 @@ Bug-Debian: http://bugs.debian.org/729840 \ No newline at end of file --- a/build.xml +++ b/build.xml -@@ -233,6 +233,7 @@ +@@ -232,6 +232,7 @@ <filter token="YEAR" value="${year}"/> <filter token="VERSION" value="${version}"/> <filter token="VERSION_NUMBER" value="${version.number}"/> + <filter token="TOMCAT_DISTRIBUTION" value="${distribution.name}"/> <filter token="VERSION_MAJOR" value="${version.major}"/> <filter token="VERSION_MAJOR_MINOR" value="${version.major.minor}"/> - <filter token="VERSION_BUILT" value="${today} ${tstamp}"/> + <filter token="VERSION_BUILT" value="${today} ${tstamp} UTC"/> -- 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
