[tomcat7] 04/04: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu May 22 14:19:34 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat7.
commit 77e5eb913d5e06f66c936c2f41d20cebba24b695
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu May 22 10:35:33 2014 +0200
Refreshed the patches
---
debian/changelog | 4 +++-
.../0002-do-not-load-AJP13-connector-by-default.patch | 2 +-
...-split-deploy-webapps-target-from-deploy-target.patch | 4 ++--
.../0006-add-JARs-below-var-to-class-loader.patch | 6 +++---
debian/patches/0010-debianize-build-xml.patch | 4 ++--
debian/patches/0011-fix-classpath-lintian-warnings.patch | 10 +++++-----
...013-dont-look-for-build-properties-in-user-home.patch | 2 +-
debian/patches/0017-use-jdbc-pool-default.patch | 4 ++--
debian/patches/0018-fix-manager-webapp.patch | 16 ++++++++--------
debian/patches/0019-add-distribution-to-error-page.patch | 11 +++++------
10 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 36dc634..208d841 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-tomcat7 (7.0.53-2) UNRELEASED; urgency=medium
+tomcat7 (7.0.54-1) unstable; urgency=medium
+ * New upstream release
+ * Refreshed the patches
* Use XZ compression for the upstream tarball
-- Emmanuel Bourg <ebourg at apache.org> Thu, 22 May 2014 10:27:10 +0200
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 fe812e3..bc7fcab 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
-@@ -89,7 +89,9 @@
+@@ -90,7 +90,9 @@
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
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 7dd632b..c0a98bf 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
@@ -8,7 +8,7 @@ Subject: [PATCH] split deploy-webapps target from deploy target
--- a/build.xml
+++ b/build.xml
-@@ -934,7 +934,7 @@
+@@ -949,7 +949,7 @@
</xslt>
</target>
@@ -17,7 +17,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"
-@@ -972,6 +972,10 @@
+@@ -987,6 +987,10 @@
</fileset>
</copy>
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 2b735f6..6bf9a3f 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
@@ -8,7 +8,7 @@ Subject: [PATCH] add JARs below /var to class loader
--- a/conf/catalina.properties
+++ b/conf/catalina.properties
-@@ -44,7 +44,7 @@
+@@ -46,7 +46,7 @@
# "foo/*.jar": Add all the JARs of the specified folder as class
# repositories
# "foo/bar.jar": Add bar.jar as a class repository
@@ -17,7 +17,7 @@ Subject: [PATCH] add JARs below /var to class loader
#
# List of comma-separated paths defining the contents of the "server"
-@@ -57,7 +57,7 @@
+@@ -59,7 +59,7 @@
# "foo/*.jar": Add all the JARs of the specified folder as class
# repositories
# "foo/bar.jar": Add bar.jar as a class repository
@@ -26,7 +26,7 @@ Subject: [PATCH] add JARs below /var to class loader
#
# List of comma-separated paths defining the contents of the "shared"
-@@ -71,7 +71,7 @@
+@@ -73,7 +73,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 3995096..4698ee0 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
-@@ -595,7 +595,7 @@
+@@ -598,7 +598,7 @@
<target name="compile" depends="compile-java6,compile-java7" />
<target name="compile-java6"
@@ -14,7 +14,7 @@ Last-Update: 2011-05-16
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
debug="${compile.debug}"
-@@ -937,12 +937,14 @@
+@@ -952,12 +952,14 @@
<target name="deploy" depends="package,build-docs,deploy-webapps"
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 ab90a61..b21ac1a 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
-@@ -754,7 +754,8 @@
+@@ -757,7 +757,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}"
-@@ -762,8 +763,7 @@
+@@ -765,8 +766,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>
-@@ -771,9 +771,8 @@
+@@ -774,9 +774,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>
-@@ -781,9 +780,8 @@
+@@ -784,9 +783,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>
-@@ -791,7 +789,7 @@
+@@ -794,7 +792,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 a4f0905..46e2f76 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
-@@ -469,7 +469,6 @@
+@@ -472,7 +472,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 4ff6390..97ecf55 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
-@@ -579,7 +579,7 @@
+@@ -581,7 +581,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
-@@ -685,7 +685,7 @@ conn.close();
+@@ -662,7 +662,7 @@
<p>The configuration properties for Tomcat's standard data source
resource factory
diff --git a/debian/patches/0018-fix-manager-webapp.patch b/debian/patches/0018-fix-manager-webapp.patch
index 39f4e3c..ec57f20 100644
--- a/debian/patches/0018-fix-manager-webapp.patch
+++ b/debian/patches/0018-fix-manager-webapp.patch
@@ -19,15 +19,15 @@ Last-Update: <2013-08-01>
</Context>
--- a/webapps/docs/manager-howto.xml
+++ b/webapps/docs/manager-howto.xml
-@@ -72,7 +72,7 @@
+@@ -71,7 +71,7 @@
+ <code>$CATALINA_BASE/conf/[enginename]/[hostname]</code> folder. Here is an
example:</p>
- <pre>
- <Context privileged="true" antiResourceLocking="false"
-- docBase="${catalina.home}/webapps/manager">
-+ docBase="${catalina.home}/../tomcat7-admin/manager">
- <Valve className="org.apache.catalina.valves.RemoteAddrValve"
- allow="127\.0\.0\.1" />
- </Context>
+ <source><![CDATA[<Context privileged="true" antiResourceLocking="false"
+- docBase="${catalina.home}/webapps/manager">
++ docBase="${catalina.home}/../tomcat7-admin/manager">
+ <Valve className="org.apache.catalina.valves.RemoteAddrValve"
+ allow="127\.0\.0\.1" />
+ </Context>]]></source>
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
@@ -199,14 +199,14 @@
diff --git a/debian/patches/0019-add-distribution-to-error-page.patch b/debian/patches/0019-add-distribution-to-error-page.patch
index d91135a..fcb0761 100644
--- a/debian/patches/0019-add-distribution-to-error-page.patch
+++ b/debian/patches/0019-add-distribution-to-error-page.patch
@@ -1,5 +1,5 @@
---- a/java/org/apache/catalina/util/ServerInfo.properties 2013-11-18 09:42:08.877938000 +0000
-+++ b/java/org/apache/catalina/util/ServerInfo.properties 2013-11-18 16:28:22.546386103 +0000
+--- a/java/org/apache/catalina/util/ServerInfo.properties
++++ b/java/org/apache/catalina/util/ServerInfo.properties
@@ -13,6 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
@@ -10,10 +10,9 @@
-server.built=@VERSION_BUILT@
\ No newline at end of file
+server.built=@VERSION_BUILT@
-
---- a/build.xml 2013-11-18 16:24:56.000000000 +0000
-+++ b/build.xml 2013-11-18 16:38:33.094386103 +0000
-@@ -220,6 +220,7 @@
+--- a/build.xml
++++ b/build.xml
+@@ -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