[tomcat8] 02/05: Refreshed the patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Dec 1 08:29:37 UTC 2017 

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

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

commit a2647e5f7f086b96a2ada051ae5bef3efe86a0b0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 27 15:11:05 2017 +0100

    Refreshed the patches
---
 debian/changelog                                               |  8 ++++++++
 .../0004-split-deploy-webapps-target-from-deploy-target.patch  |  4 ++--
 debian/patches/0005-skip-test-failures.patch                   |  2 +-
 .../0009-Use-java.security.policy-file-in-catalina.sh.patch    | 10 +++++-----
 debian/patches/0010-debianize-build-xml.patch                  |  4 ++--
 .../0013-dont-look-for-build-properties-in-user-home.patch     |  2 +-
 debian/patches/0019-add-distribution-to-error-page.patch       |  2 +-
 7 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 49e6a2e..0bcec26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tomcat8 (8.5.24-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 27 Nov 2017 15:10:46 +0100
+
 tomcat8 (8.5.23-1) unstable; urgency=medium
 
   * Team upload.
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 7bc6495..875c336 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
-@@ -1003,7 +1003,7 @@
+@@ -1006,7 +1006,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"
-@@ -1042,6 +1042,10 @@
+@@ -1045,6 +1045,10 @@
        </fileset>
      </copy>
  
diff --git a/debian/patches/0005-skip-test-failures.patch b/debian/patches/0005-skip-test-failures.patch
index 0bc3364..b763a1e 100644
--- a/debian/patches/0005-skip-test-failures.patch
+++ b/debian/patches/0005-skip-test-failures.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/build.xml
 +++ b/build.xml
-@@ -1382,8 +1382,10 @@
+@@ -1385,8 +1385,10 @@
        </filterchain>
      </concat>
  
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 8123815..bc1de87 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
@@ -9,7 +9,7 @@ Bug-Debian: http://bugs.debian.org/585379
 Forwarded: not-needed
 --- a/bin/catalina.sh
 +++ b/bin/catalina.sh
-@@ -330,7 +330,7 @@
+@@ -356,7 +356,7 @@
          -classpath "$CLASSPATH" \
          -sourcepath "$CATALINA_HOME"/../../java \
          -Djava.security.manager \
@@ -18,8 +18,8 @@ Forwarded: not-needed
          -Dcatalina.base="$CATALINA_BASE" \
          -Dcatalina.home="$CATALINA_HOME" \
          -Djava.io.tmpdir="$CATALINA_TMPDIR" \
-@@ -357,7 +357,7 @@
-     eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
+@@ -385,7 +385,7 @@
+       -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
        -classpath "\"$CLASSPATH\"" \
        -Djava.security.manager \
 -      -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \
@@ -27,8 +27,8 @@ Forwarded: not-needed
        -Dcatalina.base="\"$CATALINA_BASE\"" \
        -Dcatalina.home="\"$CATALINA_HOME\"" \
        -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
-@@ -423,7 +423,7 @@
-     eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
+@@ -453,7 +453,7 @@
+       -D$ENDORSED_PROP="\"$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 7f48d8d..f4b7753 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
-@@ -654,7 +654,7 @@
+@@ -657,7 +657,7 @@
      </copy>
    </target>
  
@@ -14,7 +14,7 @@ Last-Update: 2011-05-16
      <!-- Compile internal server components -->
      <javac srcdir="java" destdir="${tomcat.classes}"
             debug="${compile.debug}"
-@@ -1006,12 +1006,14 @@
+@@ -1009,12 +1009,14 @@
    <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples,deploy-webapps"
            description="Default. Builds a working Tomcat instance">
  
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 1ab43bf..3319e5b 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
@@ -3,7 +3,7 @@ Date: Mon, 9 Jul 2012 20:53:38 +0000
 Subject: 0013-dont-look-for-build-properties-in-user-home
 --- a/build.xml
 +++ b/build.xml
-@@ -518,7 +518,6 @@
+@@ -521,7 +521,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 7d83ee1..dfa1e81 100644
--- a/debian/patches/0019-add-distribution-to-error-page.patch
+++ b/debian/patches/0019-add-distribution-to-error-page.patch
@@ -16,7 +16,7 @@ Bug-Debian: http://bugs.debian.org/729840
 \ No newline at end of file
 --- a/build.xml
 +++ b/build.xml
-@@ -231,6 +231,7 @@
+@@ -237,6 +237,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/tomcat8.git

More information about the pkg-java-commits mailing list