[tomcat8] 06/10: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Sep 20 08:21:44 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat8.
commit 191a30dcbc3a4b24b1b66a50f6dce486390d502c
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Jul 28 11:22:30 2017 +0200
Refreshed the patches
---
debian/changelog | 2 +-
.../patches/0004-split-deploy-webapps-target-from-deploy-target.patch | 4 ++--
debian/patches/0005-skip-test-failures.patch | 2 +-
debian/patches/0010-debianize-build-xml.patch | 4 ++--
debian/patches/0013-dont-look-for-build-properties-in-user-home.patch | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 723ef55..92fb091 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-tomcat8 (8.5.18-1) UNRELEASED; urgency=medium
+tomcat8 (8.5.19-1) UNRELEASED; urgency=medium
* Team upload.
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 08fe481..dd1d745 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
-@@ -998,7 +998,7 @@
+@@ -1004,7 +1004,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"
-@@ -1037,6 +1037,10 @@
+@@ -1043,6 +1043,10 @@
</fileset>
</copy>
diff --git a/debian/patches/0005-skip-test-failures.patch b/debian/patches/0005-skip-test-failures.patch
index bfbdc67..0bc3364 100644
--- a/debian/patches/0005-skip-test-failures.patch
+++ b/debian/patches/0005-skip-test-failures.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -1376,8 +1376,10 @@
+@@ -1382,8 +1382,10 @@
</filterchain>
</concat>
diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index 5dba319..32606a6 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
-@@ -649,7 +649,7 @@
+@@ -655,7 +655,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}"
-@@ -1001,12 +1001,14 @@
+@@ -1007,12 +1007,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 aee1c54..e297c9d 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
-@@ -512,7 +512,6 @@
+@@ -517,7 +517,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
More information about the pkg-java-commits
mailing list