[tomcat7] 03/03: Refreshed the patches

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat7.

commit 297434f6b8e3d719628f3d9058827be8d8b86a29
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Apr 23 11:29:35 2016 +0200

    Refreshed the patches
---
 debian/changelog                                                    | 4 +++-
 .../patches/0009-Use-java.security.policy-file-in-catalina.sh.patch | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6acd17e..8f77530 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-tomcat7 (7.0.68-2) UNRELEASED; urgency=medium
+tomcat7 (7.0.69-1) UNRELEASED; urgency=medium
 
+  * New upstream release
+    - Refreshed the patches
   * Standards-Version updated to 3.9.8 (no changes)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sat, 23 Apr 2016 11:23:30 +0200
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 567070e..c215366 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 @@
+@@ -292,7 +292,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 @@
+@@ -319,7 +319,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\"" \
-@@ -376,7 +376,7 @@
+@@ -385,7 +385,7 @@
      eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
        -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \
        -Djava.security.manager \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git