This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit 1ffa4eb10f2873ed74113eb6e7ca2780e33fa2b3 Author: Emmanuel Bourg <[email protected]> Date: Mon Dec 5 22:48:12 2016 +0100 Refreshed the patches --- debian/changelog | 8 ++++++++ .../patches/0002-do-not-load-AJP13-connector-by-default.patch | 2 +- debian/patches/0005-skip-test-failures.patch | 11 +---------- debian/rules | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 74802f8..7afc858 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +tomcat8 (8.5.9-1) UNRELEASED; urgency=medium + + * Team upload. + * New upstream release + - Refreshed the patches + + -- Emmanuel Bourg <[email protected]> Mon, 05 Dec 2016 22:47:09 +0100 + tomcat8 (8.5.8-2) unstable; urgency=medium * Team upload. diff --git a/debian/patches/0002-do-not-load-AJP13-connector-by-default.patch b/debian/patches/0002-do-not-load-AJP13-connector-by-default.patch index 72c01b5..02c65f0 100644 --- a/debian/patches/0002-do-not-load-AJP13-connector-by-default.patch +++ b/debian/patches/0002-do-not-load-AJP13-connector-by-default.patch @@ -2,7 +2,7 @@ Description: Do not load AJP13 connector by default Author: Thierry Carrez <[email protected]> --- a/conf/server.xml +++ b/conf/server.xml -@@ -108,7 +108,9 @@ +@@ -113,7 +113,9 @@ --> <!-- Define an AJP 1.3 Connector on port 8009 --> diff --git a/debian/patches/0005-skip-test-failures.patch b/debian/patches/0005-skip-test-failures.patch index c615bcd..c3bdc1f 100644 --- a/debian/patches/0005-skip-test-failures.patch +++ b/debian/patches/0005-skip-test-failures.patch @@ -1,4 +1,4 @@ -Description: Ignore the failing tests and print only the summary +Description: Ignore the failing tests Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.xml @@ -14,12 +14,3 @@ Forwarded: not-needed </target> <target name="test-nio" description="Runs the JUnit test cases for NIO. Does not stop on errors." -@@ -1415,7 +1417,7 @@ - - <sequential> - <mkdir dir="${test.reports}" /> -- <junit printsummary="yes" fork="yes" dir="." showoutput="yes" -+ <junit printsummary="yes" fork="yes" dir="." showoutput="no" - errorproperty="test.result.error" - failureproperty="test.result.failure" - haltonfailure="${test.haltonfailure}" diff --git a/debian/rules b/debian/rules index 19d6aa4..1b1fa70 100755 --- a/debian/rules +++ b/debian/rules @@ -33,7 +33,7 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) mkdir -p webapps/examples/WEB-INF/lib cp /usr/share/java/taglibs-standard-spec.jar webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.5.jar cp /usr/share/java/taglibs-standard-impl.jar webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar - $(ANT) test -Dtest.apr.loc=/usr/lib/$(shell dpkg-architecture --query DEB_BUILD_MULTIARCH) + $(ANT) test -Dtest.apr.loc=/usr/lib/$(shell dpkg-architecture --query DEB_BUILD_MULTIARCH) -Dtest.verbose=false endif override_dh_installchangelogs: -- 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
