This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit 0616fd74cec7c682deb620060e8a269af29a3869 Author: Emmanuel Bourg <[email protected]> Date: Sun Jan 18 21:35:12 2015 +0100 Refreshed the patches --- debian/changelog | 7 +++++++ .../0004-split-deploy-webapps-target-from-deploy-target.patch | 4 ++-- 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 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index ef7cba6..982d3d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +tomcat8 (8.0.17-1) UNRELEASED; urgency=medium + + * New upstream release + - Refreshed the patches + + -- Emmanuel Bourg <[email protected]> Sun, 18 Jan 2015 21:30:57 +0100 + tomcat8 (8.0.15-1) experimental; 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 dfdb1aa..9b0f76e 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 -@@ -988,7 +988,7 @@ +@@ -990,7 +990,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" -@@ -1027,6 +1027,10 @@ +@@ -1029,6 +1029,10 @@ </fileset> </copy> diff --git a/debian/patches/0005-skip-test-failures.patch b/debian/patches/0005-skip-test-failures.patch index 44a586f..f0be66c 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 -@@ -1342,8 +1342,10 @@ +@@ -1344,8 +1344,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." -@@ -1402,7 +1404,7 @@ +@@ -1404,7 +1406,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 e4370ba..08d8c4e 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 -@@ -639,7 +639,7 @@ +@@ -641,7 +641,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}" -@@ -991,12 +991,14 @@ +@@ -993,12 +993,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 1ab43bf..6be79fe 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 -@@ -518,7 +518,6 @@ +@@ -520,7 +520,6 @@ <!-- Property that determines if manifests need updating --> <uptodate property="manifests.uptodate" targetfile="${tomcat.manifests}/default.manifest" > -- 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
