This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat7.
commit c4e09780c15201e5d9da9e64e2b1369ca20a8dd3 Author: Emmanuel Bourg <[email protected]> Date: Wed May 27 11:43:03 2015 +0200 Refreshed the patches --- debian/changelog | 4 +++- .../patches/0009-Use-java.security.policy-file-in-catalina.sh.patch | 6 +++--- debian/patches/0017-use-jdbc-pool-default.patch | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9d3579a..a10e577 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ -tomcat7 (7.0.61-2) UNRELEASED; urgency=medium +tomcat7 (7.0.62-1) UNRELEASED; urgency=medium + * New upstream release + - Refreshed the patches * Replaced the date in ServerInfo.properties and in the documentation with the latest date in debian/changelog to make the build reproducible * debian/rules: 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 e6036b7..567070e 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 -@@ -283,7 +283,7 @@ if [ "$1" = "debug" ] ; then +@@ -283,7 +283,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" \ -@@ -310,7 +310,7 @@ elif [ "$1" = "run" ]; then +@@ -310,7 +310,7 @@ eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ -Djava.security.manager \ @@ -32,7 +32,7 @@ Forwarded: not-needed -Dcatalina.base="\"$CATALINA_BASE\"" \ -Dcatalina.home="\"$CATALINA_HOME\"" \ -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ -@@ -374,7 +374,7 @@ elif [ "$1" = "start" ] ; then +@@ -376,7 +376,7 @@ eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ -Djava.security.manager \ diff --git a/debian/patches/0017-use-jdbc-pool-default.patch b/debian/patches/0017-use-jdbc-pool-default.patch index f3dc59e..452fcbb 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 -@@ -625,7 +625,7 @@ +@@ -635,7 +635,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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
