[tomcat7] 02/08: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed May 6 15:48:05 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat7.
commit ab13aa52a0d803181c59a4e0bad346d163160c2b
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sun Apr 26 00:37:44 2015 +0200
Refreshed the patches
---
debian/changelog | 4 +++-
.../patches/0001-set-UTF-8-as-default-character-encoding.patch | 2 +-
.../patches/0002-do-not-load-AJP13-connector-by-default.patch | 2 +-
debian/patches/0003-disable-APR-library-loading.patch | 2 +-
.../0004-split-deploy-webapps-target-from-deploy-target.patch | 4 ++--
debian/patches/0010-debianize-build-xml.patch | 6 +++---
debian/patches/0011-fix-classpath-lintian-warnings.patch | 10 +++++-----
.../0013-dont-look-for-build-properties-in-user-home.patch | 2 +-
debian/patches/0017-use-jdbc-pool-default.patch | 4 ++--
debian/patches/0019-add-distribution-to-error-page.patch | 2 +-
10 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f7c2207..03d5281 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-tomcat7 (7.0.59-3) UNRELEASED; urgency=medium
+tomcat7 (7.0.61-1) UNRELEASED; urgency=medium
+ * New upstream release
+ * Refreshed the patches
* debian/orig-tar.sh: Exclude the taglibs-standard-*.jar files
from the upstream tarball
diff --git a/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch b/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch
index b63dd41..be091e7 100644
--- a/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch
+++ b/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] set UTF-8 as default character encoding
--- a/conf/server.xml
+++ b/conf/server.xml
-@@ -69,6 +69,7 @@
+@@ -70,6 +70,7 @@
-->
<Connector port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
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 bc7fcab..8d7c680 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
@@ -8,7 +8,7 @@ Subject: [PATCH] do not load AJP13 connector by default
--- a/conf/server.xml
+++ b/conf/server.xml
-@@ -90,7 +90,9 @@
+@@ -91,7 +91,9 @@
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
diff --git a/debian/patches/0003-disable-APR-library-loading.patch b/debian/patches/0003-disable-APR-library-loading.patch
index 4577a28..5b7ae51 100644
--- a/debian/patches/0003-disable-APR-library-loading.patch
+++ b/debian/patches/0003-disable-APR-library-loading.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] disable APR library loading
--- a/conf/server.xml
+++ b/conf/server.xml
-@@ -24,7 +24,9 @@
+@@ -25,7 +25,9 @@
<Listener className="org.apache.catalina.security.SecurityListener" />
-->
<!--APR library loader. Documentation at /docs/apr.html -->
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 e219b05..d8eca91 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
-@@ -949,7 +949,7 @@
+@@ -979,7 +979,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"
-@@ -987,6 +987,10 @@
+@@ -1017,6 +1017,10 @@
</fileset>
</copy>
diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index d22d51c..ac14cc1 100644
--- a/debian/patches/0010-debianize-build-xml.patch
+++ b/debian/patches/0010-debianize-build-xml.patch
@@ -5,8 +5,8 @@ Last-Update: 2011-05-16
--- a/build.xml
+++ b/build.xml
-@@ -598,7 +598,7 @@
- <target name="compile" depends="compile-java6,compile-java7" />
+@@ -628,7 +628,7 @@
+ <target name="compile" depends="compile-java6,check-java7,compile-java7" />
<target name="compile-java6"
- depends="build-prepare,download-compile,compile-prepare,validate">
@@ -14,7 +14,7 @@ Last-Update: 2011-05-16
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
debug="${compile.debug}"
-@@ -952,12 +952,14 @@
+@@ -982,12 +982,14 @@
<target name="deploy" depends="package,build-docs,deploy-webapps,compile-webapp-examples"
description="Default. Builds a working Tomcat instance">
diff --git a/debian/patches/0011-fix-classpath-lintian-warnings.patch b/debian/patches/0011-fix-classpath-lintian-warnings.patch
index b21ac1a..77e0986 100644
--- a/debian/patches/0011-fix-classpath-lintian-warnings.patch
+++ b/debian/patches/0011-fix-classpath-lintian-warnings.patch
@@ -5,7 +5,7 @@ Last-Update: 2014-05-01
--- a/build.xml
+++ b/build.xml
-@@ -757,7 +757,8 @@
+@@ -787,7 +787,8 @@
<!-- Jasper Implementation JAR File -->
<jarIt jarfile="${jasper.jar}"
filesDir="${tomcat.classes}"
@@ -15,7 +15,7 @@ Last-Update: 2014-05-01
<!-- Jasper EL Implementation JAR File -->
<jarIt jarfile="${jasper-el.jar}"
-@@ -765,8 +766,7 @@
+@@ -795,8 +796,7 @@
filesId="files.jasper-el" />
<!-- i18n JARs -->
@@ -25,7 +25,7 @@ Last-Update: 2014-05-01
<fileset dir="${tomcat.classes}">
<include name="**/LocalStrings_es.properties" />
</fileset>
-@@ -774,9 +774,8 @@
+@@ -804,9 +804,8 @@
fullpath="META-INF/NOTICE" />
<zipfileset file="${tomcat.manifests}/default.license"
fullpath="META-INF/LICENSE" />
@@ -37,7 +37,7 @@ Last-Update: 2014-05-01
<fileset dir="${tomcat.classes}">
<include name="**/LocalStrings_fr.properties" />
</fileset>
-@@ -784,9 +783,8 @@
+@@ -814,9 +813,8 @@
fullpath="META-INF/NOTICE" />
<zipfileset file="${tomcat.manifests}/default.license"
fullpath="META-INF/LICENSE" />
@@ -49,7 +49,7 @@ Last-Update: 2014-05-01
<fileset dir="${tomcat.classes}">
<include name="**/LocalStrings_ja.properties" />
</fileset>
-@@ -794,7 +792,7 @@
+@@ -824,7 +822,7 @@
fullpath="META-INF/NOTICE" />
<zipfileset file="${tomcat.manifests}/default.license"
fullpath="META-INF/LICENSE" />
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 46e2f76..e000c89 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
@@ -8,7 +8,7 @@ Subject: 0013-dont-look-for-build-properties-in-user-home
--- a/build.xml
+++ b/build.xml
-@@ -472,7 +472,6 @@
+@@ -502,7 +502,6 @@
<!-- Property that determines if manifests need updating -->
<uptodate property="manifests.uptodate"
targetfile="${tomcat.manifests}/default.manifest" >
diff --git a/debian/patches/0017-use-jdbc-pool-default.patch b/debian/patches/0017-use-jdbc-pool-default.patch
index 4579047..f3dc59e 100644
--- a/debian/patches/0017-use-jdbc-pool-default.patch
+++ b/debian/patches/0017-use-jdbc-pool-default.patch
@@ -25,7 +25,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Package + ".OpenEjbFactory";
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
-@@ -584,7 +584,7 @@
+@@ -625,7 +625,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
@@ -36,7 +36,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
</property>
--- a/webapps/docs/jndi-resources-howto.xml
+++ b/webapps/docs/jndi-resources-howto.xml
-@@ -662,7 +662,7 @@
+@@ -759,7 +759,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 d01acfa..78eeab6 100644
--- a/debian/patches/0019-add-distribution-to-error-page.patch
+++ b/debian/patches/0019-add-distribution-to-error-page.patch
@@ -12,7 +12,7 @@
+server.built=@VERSION_BUILT@
--- a/build.xml
+++ b/build.xml
-@@ -223,6 +223,7 @@
+@@ -224,6 +224,7 @@
<filter token="YEAR" value="${year}"/>
<filter token="VERSION" value="${version}"/>
<filter token="VERSION_NUMBER" value="${version.number}"/>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git
More information about the pkg-java-commits
mailing list