[tomcat7] 04/11: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Feb 18 22:07:14 GMT 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat7.
commit bb26fef11d0066a6b68cea77a3fb9a9e6135f5e2
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sat Dec 19 10:28:52 2015 +0100
Refreshed the patches
---
debian/changelog | 2 +-
.../0004-split-deploy-webapps-target-from-deploy-target.patch | 4 ++--
debian/patches/0010-debianize-build-xml.patch | 4 ++--
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 +-
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9c4cf53..bbb8379 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-tomcat7 (7.0.65-1) UNRELEASED; urgency=medium
+tomcat7 (7.0.67-1) UNRELEASED; urgency=medium
* Team upload.
* 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 ceaf411..5672caa 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
-@@ -982,7 +982,7 @@
+@@ -985,7 +985,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"
-@@ -1020,6 +1020,10 @@
+@@ -1023,6 +1023,10 @@
</fileset>
</copy>
diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index 3f6cccc..4e90812 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
-@@ -631,7 +631,7 @@
+@@ -634,7 +634,7 @@
<target name="compile" depends="compile-java6,check-java7,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}"
-@@ -985,12 +985,14 @@
+@@ -988,12 +988,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 7e466b6..1e92451 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
-@@ -790,7 +790,8 @@
+@@ -793,7 +793,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}"
-@@ -798,8 +799,7 @@
+@@ -801,8 +802,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>
-@@ -807,9 +807,8 @@
+@@ -810,9 +810,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>
-@@ -817,9 +816,8 @@
+@@ -820,9 +819,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>
-@@ -827,7 +825,7 @@
+@@ -830,7 +828,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 f0cb472..8b57ec2 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
-@@ -501,7 +501,6 @@
+@@ -504,7 +504,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 8369d35..58d15a5 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
-@@ -635,7 +635,7 @@
+@@ -637,7 +637,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
-@@ -759,7 +759,7 @@
+@@ -760,7 +760,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 78eeab6..413d87d 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
-@@ -224,6 +224,7 @@
+@@ -227,6 +227,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