[tomcat7] 02/03: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Jun 20 11:52:33 UTC 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 966fb092aaff11f83751bb47a0085ded2279bf1f
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Jun 16 00:05:53 2016 +0200
Refreshed the patches
---
debian/changelog | 7 +++++++
.../0004-split-deploy-webapps-target-from-deploy-target.patch | 4 ++--
.../0009-Use-java.security.policy-file-in-catalina.sh.patch | 8 ++++----
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/0019-add-distribution-to-error-page.patch | 2 +-
debian/patches/0026-add-asm-to-test-classpath.patch | 2 +-
8 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 24fd204..b8d1cfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomcat7 (7.0.70-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 16 Jun 2016 00:05:12 +0200
+
tomcat7 (7.0.69-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 5672caa..5657f68 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
-@@ -985,7 +985,7 @@
+@@ -986,7 +986,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"
-@@ -1023,6 +1023,10 @@
+@@ -1024,6 +1024,10 @@
</fileset>
</copy>
diff --git a/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch b/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch
index c215366..7b34743 100644
--- a/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch
+++ b/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch
@@ -14,7 +14,7 @@ Forwarded: not-needed
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
-@@ -292,7 +292,7 @@
+@@ -311,7 +311,7 @@
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-sourcepath "$CATALINA_HOME"/../../java \
-Djava.security.manager \
@@ -23,7 +23,7 @@ Forwarded: not-needed
-Dcatalina.base="$CATALINA_BASE" \
-Dcatalina.home="$CATALINA_HOME" \
-Djava.io.tmpdir="$CATALINA_TMPDIR" \
-@@ -319,7 +319,7 @@
+@@ -338,7 +338,7 @@
eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
-Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \
-Djava.security.manager \
@@ -32,8 +32,8 @@ Forwarded: not-needed
-Dcatalina.base="\"$CATALINA_BASE\"" \
-Dcatalina.home="\"$CATALINA_HOME\"" \
-Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
-@@ -385,7 +385,7 @@
- eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
+@@ -404,7 +404,7 @@
+ eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
-Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \
-Djava.security.manager \
- -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \
diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index 4e90812..b2122ac 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
-@@ -634,7 +634,7 @@
+@@ -635,7 +635,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}"
-@@ -988,12 +988,14 @@
+@@ -989,12 +989,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 1e92451..0583337 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
-@@ -793,7 +793,8 @@
+@@ -794,7 +794,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}"
-@@ -801,8 +802,7 @@
+@@ -802,8 +803,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>
-@@ -810,9 +810,8 @@
+@@ -811,9 +811,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>
-@@ -820,9 +819,8 @@
+@@ -821,9 +820,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>
-@@ -830,7 +828,7 @@
+@@ -831,7 +829,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 8b57ec2..4de2d7b 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
-@@ -504,7 +504,6 @@
+@@ -505,7 +505,6 @@
<!-- Property that determines if manifests need updating -->
<uptodate property="manifests.uptodate"
targetfile="${tomcat.manifests}/default.manifest" >
diff --git a/debian/patches/0019-add-distribution-to-error-page.patch b/debian/patches/0019-add-distribution-to-error-page.patch
index 413d87d..e2a2fae 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
-@@ -227,6 +227,7 @@
+@@ -228,6 +228,7 @@
<filter token="YEAR" value="${year}"/>
<filter token="VERSION" value="${version}"/>
<filter token="VERSION_NUMBER" value="${version.number}"/>
diff --git a/debian/patches/0026-add-asm-to-test-classpath.patch b/debian/patches/0026-add-asm-to-test-classpath.patch
index ef988a4..71fca38 100644
--- a/debian/patches/0026-add-asm-to-test-classpath.patch
+++ b/debian/patches/0026-add-asm-to-test-classpath.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -205,6 +205,7 @@
+@@ -206,6 +206,7 @@
<pathelement location="${easymock.jar}"/>
<pathelement location="${cglib.jar}"/>
<pathelement location="${objenesis.jar}"/>
--
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