This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat7.
commit 6fda755993c50bd7324c88a06a8d3caa987205e0 Author: Emmanuel Bourg <[email protected]> Date: Tue Jul 29 17:26:52 2014 +0200 Refreshed the patches --- debian/changelog | 7 +++++++ .../0004-split-deploy-webapps-target-from-deploy-target.patch | 9 ++------- debian/patches/0010-debianize-build-xml.patch | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index b18e809..63c0af3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +tomcat7 (7.0.55-1) unstable; urgency=medium + + * New upstream release + * Refreshed the patches + + -- Emmanuel Bourg <[email protected]> Tue, 29 Jul 2014 17:25:50 +0200 + tomcat7 (7.0.54-2) unstable; urgency=medium [ Emmanuel Bourg ] 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 c0a98bf..e219b05 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 @@ -1,19 +1,14 @@ From: Debian Java Maintainers <[email protected]> Date: Mon, 28 Jun 2010 21:32:35 +0200 Subject: [PATCH] split deploy-webapps target from deploy target - ---- - build.xml | 13 ++++++++----- - 1 files changed, 8 insertions(+), 5 deletions(-) - --- a/build.xml +++ b/build.xml @@ -949,7 +949,7 @@ </xslt> </target> -- <target name="deploy" depends="package,build-docs" -+ <target name="deploy" depends="package,build-docs,deploy-webapps" +- <target name="deploy" depends="package,build-docs,compile-webapp-examples" ++ <target name="deploy" depends="package,build-docs,deploy-webapps,compile-webapp-examples" description="Default. Builds a working Tomcat instance"> <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch index 4698ee0..d22d51c 100644 --- a/debian/patches/0010-debianize-build-xml.patch +++ b/debian/patches/0010-debianize-build-xml.patch @@ -15,7 +15,7 @@ Last-Update: 2011-05-16 <javac srcdir="java" destdir="${tomcat.classes}" debug="${compile.debug}" @@ -952,12 +952,14 @@ - <target name="deploy" depends="package,build-docs,deploy-webapps" + <target name="deploy" depends="package,build-docs,deploy-webapps,compile-webapp-examples" description="Default. Builds a working Tomcat instance"> + <!-- -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
