[tomcat8] 02/02: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu May 22 12:31:16 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat8.
commit 10ac64eea25c0c94bc84b11ec38cf368774edbb3
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu May 22 13:04:44 2014 +0200
Refreshed the patches
---
debian/changelog | 7 +++++++
.../0004-split-deploy-webapps-target-from-deploy-target.patch | 4 ++--
debian/patches/0005-skip-test-failures.patch | 6 +++---
debian/patches/0006-add-JARs-below-var-to-class-loader.patch | 6 +++---
debian/patches/0010-debianize-build-xml.patch | 4 ++--
.../patches/0013-dont-look-for-build-properties-in-user-home.patch | 2 +-
debian/patches/0014-JDTCompiler.patch | 2 +-
debian/patches/0017-use-jdbc-pool-default.patch | 4 ++--
debian/patches/0019-add-distribution-to-error-page.patch | 2 +-
debian/patches/0020-disable-java8-support-with-jdtcompiler.patch | 4 ++--
10 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f04dc47..31ef501 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomcat8 (8.0.8-1) unstable; urgency=medium
+
+ * New upstream release
+ - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 22 May 2014 13:01:55 +0200
+
tomcat8 (8.0.5-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 e3dad0e..8c5674f 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
-@@ -986,7 +986,7 @@
+@@ -984,7 +984,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"
-@@ -1024,6 +1024,10 @@
+@@ -1022,6 +1022,10 @@
</fileset>
</copy>
diff --git a/debian/patches/0005-skip-test-failures.patch b/debian/patches/0005-skip-test-failures.patch
index 12387d4..db96dd4 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
-@@ -1322,8 +1322,10 @@
+@@ -1318,8 +1318,10 @@
<target name="test" description="Runs the JUnit test cases"
depends="test-bio,test-nio,test-nio2,test-apr,cobertura-report" >
@@ -14,10 +14,10 @@ Forwarded: not-needed
</target>
<target name="test-bio" description="Runs the JUnit test cases for BIO. Does not stop on errors."
-@@ -1365,7 +1367,7 @@
- description="The extension to use to distinguish the output"/>
+@@ -1362,7 +1364,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"
diff --git a/debian/patches/0006-add-JARs-below-var-to-class-loader.patch b/debian/patches/0006-add-JARs-below-var-to-class-loader.patch
index 5e51241..f29bc08 100644
--- a/debian/patches/0006-add-JARs-below-var-to-class-loader.patch
+++ b/debian/patches/0006-add-JARs-below-var-to-class-loader.patch
@@ -3,7 +3,7 @@ Date: Mon, 28 Jun 2010 21:32:57 +0200
Subject: [PATCH] add JARs below /var to class loader
--- a/conf/catalina.properties
+++ b/conf/catalina.properties
-@@ -47,7 +47,7 @@
+@@ -48,7 +48,7 @@
#
# Note: Values are enclosed in double quotes ("...") in case either the
# ${catalina.base} path or the ${catalina.home} path contains a comma.
@@ -12,7 +12,7 @@ Subject: [PATCH] add JARs below /var to class loader
#
# List of comma-separated paths defining the contents of the "server"
-@@ -60,7 +60,7 @@
+@@ -61,7 +61,7 @@
# "foo/*.jar": Add all the JARs of the specified folder as class
# repositories
# "foo/bar.jar": Add bar.jar as a class repository
@@ -21,7 +21,7 @@ Subject: [PATCH] add JARs below /var to class loader
#
# List of comma-separated paths defining the contents of the "shared"
-@@ -74,7 +74,7 @@
+@@ -75,7 +75,7 @@
# "foo/bar.jar": Add bar.jar as a class repository
# Please note that for single jars, e.g. bar.jar, you need the URL form
# starting with file:.
diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index 7f15298..1fe6c7f 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
-@@ -642,7 +642,7 @@
+@@ -635,7 +635,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}"
-@@ -989,12 +989,14 @@
+@@ -987,12 +987,14 @@
<target name="deploy" depends="package,build-docs,build-tomcat-jdbc,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 2ca314b..3d73d85 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
-@@ -515,7 +515,6 @@
+@@ -514,7 +514,6 @@
<!-- Property that determines if manifests need updating -->
<uptodate property="manifests.uptodate"
targetfile="${tomcat.manifests}/default.manifest" >
diff --git a/debian/patches/0014-JDTCompiler.patch b/debian/patches/0014-JDTCompiler.patch
index 3f754c8..fbc9378 100644
--- a/debian/patches/0014-JDTCompiler.patch
+++ b/debian/patches/0014-JDTCompiler.patch
@@ -5,7 +5,7 @@ Author: tony mancill <tmancill at debian.org>
Forwarded: not-needed
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
-@@ -165,7 +165,7 @@
+@@ -145,7 +145,7 @@
return result;
}
diff --git a/debian/patches/0017-use-jdbc-pool-default.patch b/debian/patches/0017-use-jdbc-pool-default.patch
index ae7f5da..84f8b6f 100644
--- a/debian/patches/0017-use-jdbc-pool-default.patch
+++ b/debian/patches/0017-use-jdbc-pool-default.patch
@@ -22,7 +22,7 @@ Forwarded: not-needed
Package + ".OpenEjbFactory";
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
-@@ -589,9 +589,7 @@
+@@ -590,9 +590,7 @@
<property name="javax.sql.DataSource.Factory">
<p>The class name of the factory to use to create resources of type
<code>javax.sql.DataSource</code>. If not specified the default of
@@ -35,7 +35,7 @@ Forwarded: not-needed
<property name="javax.mail.Session.Factory">
--- a/webapps/docs/jndi-resources-howto.xml
+++ b/webapps/docs/jndi-resources-howto.xml
-@@ -659,7 +659,7 @@
+@@ -662,7 +662,7 @@
<p>The configuration properties for Tomcat's standard data source
resource factory
diff --git a/debian/patches/0019-add-distribution-to-error-page.patch b/debian/patches/0019-add-distribution-to-error-page.patch
index 0feb9bb..c83dc2f 100644
--- a/debian/patches/0019-add-distribution-to-error-page.patch
+++ b/debian/patches/0019-add-distribution-to-error-page.patch
@@ -16,7 +16,7 @@ Bug-Debian: http://bugs.debian.org/729840
\ No newline at end of file
--- a/build.xml
+++ b/build.xml
-@@ -232,6 +232,7 @@
+@@ -230,6 +230,7 @@
<filter token="YEAR" value="${year}"/>
<filter token="VERSION" value="${version}"/>
<filter token="VERSION_NUMBER" value="${version.number}"/>
diff --git a/debian/patches/0020-disable-java8-support-with-jdtcompiler.patch b/debian/patches/0020-disable-java8-support-with-jdtcompiler.patch
index f659183..a11a03d 100644
--- a/debian/patches/0020-disable-java8-support-with-jdtcompiler.patch
+++ b/debian/patches/0020-disable-java8-support-with-jdtcompiler.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
-@@ -332,9 +332,6 @@
+@@ -305,9 +305,6 @@
} else if(opt.equals("1.7")) {
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_7);
@@ -13,7 +13,7 @@ Forwarded: not-needed
} else {
log.warn("Unknown source VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_Source,
-@@ -376,11 +373,6 @@
+@@ -349,11 +346,6 @@
CompilerOptions.VERSION_1_7);
settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_1_7);
--
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