[tomcat8] 02/02: New upstream release (8.0.3) Refreshed the patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Feb 12 08:04:54 UTC 2014 

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

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

commit e7a5e65c5e94ce8aeda0768b6916b27090235840
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Feb 12 08:52:29 2014 +0100

    New upstream release (8.0.3)
    Refreshed the patches
---
 debian/changelog                                                  | 2 +-
 .../0004-split-deploy-webapps-target-from-deploy-target.patch     | 4 ++--
 debian/patches/0005-skip-test-failures.patch                      | 4 ++--
 .../0009-Use-java.security.policy-file-in-catalina.sh.patch       | 6 +++---
 debian/patches/0010-debianize-build-xml.patch                     | 4 ++--
 debian/patches/0012-java7-compat.patch                            | 2 +-
 .../0013-dont-look-for-build-properties-in-user-home.patch        | 2 +-
 debian/patches/0018-fix-manager-webapp.patch                      | 8 ++++----
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc013b7..38054da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-tomcat8 (8.0.0~RC10-1) UNRELEASED; urgency=low
+tomcat8 (8.0.3-1) UNRELEASED; urgency=low
 
   * Team upload.
   * New upstream release (Closes: #722675)
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 53c739b..33ceb01 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
-@@ -962,7 +962,7 @@
+@@ -973,7 +973,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"
-@@ -1000,6 +1000,10 @@
+@@ -1011,6 +1011,10 @@
        </fileset>
      </copy>
  
diff --git a/debian/patches/0005-skip-test-failures.patch b/debian/patches/0005-skip-test-failures.patch
index a84eac7..d1c55b0 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
-@@ -1286,8 +1286,10 @@
+@@ -1312,8 +1312,10 @@
  
    <target name="test" description="Runs the JUnit test cases"
            depends="test-bio,test-nio,test-apr,cobertura-report" >
@@ -14,7 +14,7 @@ Forwarded: not-needed
    </target>
  
    <target name="test-bio" description="Runs the JUnit test cases for BIO. Does not stop on errors."
-@@ -1323,7 +1325,7 @@
+@@ -1349,7 +1351,7 @@
                 description="The extension to use to distinguish the output"/>
  
      <sequential>
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 ef85a4d..71af131 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
-@@ -299,7 +299,7 @@
+@@ -297,7 +297,7 @@
          -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
          -sourcepath "$CATALINA_HOME"/../../java \
          -Djava.security.manager \
@@ -18,7 +18,7 @@ Forwarded: not-needed
          -Dcatalina.base="$CATALINA_BASE" \
          -Dcatalina.home="$CATALINA_HOME" \
          -Djava.io.tmpdir="$CATALINA_TMPDIR" \
-@@ -326,7 +326,7 @@
+@@ -324,7 +324,7 @@
      eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
        -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \
        -Djava.security.manager \
@@ -27,7 +27,7 @@ Forwarded: not-needed
        -Dcatalina.base="\"$CATALINA_BASE\"" \
        -Dcatalina.home="\"$CATALINA_HOME\"" \
        -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
-@@ -390,7 +390,7 @@
+@@ -388,7 +388,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/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index 763baad..ca56aaa 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
-@@ -617,7 +617,7 @@
+@@ -628,7 +628,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}"
-@@ -965,12 +965,14 @@
+@@ -976,12 +976,14 @@
    <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,deploy-webapps"
            description="Default. Builds a working Tomcat instance">
  
diff --git a/debian/patches/0012-java7-compat.patch b/debian/patches/0012-java7-compat.patch
index cedbbc3..20778db 100644
--- a/debian/patches/0012-java7-compat.patch
+++ b/debian/patches/0012-java7-compat.patch
@@ -14,7 +14,7 @@ Forwarded: not-needed
  
  /**
   * A DataSource that can be instantiated through IoC and implements the DataSource interface
-@@ -157,5 +159,7 @@
+@@ -156,5 +158,7 @@
          }
      }
  
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 e60d448..46bb139 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
-@@ -489,7 +489,6 @@
+@@ -500,7 +500,6 @@
      <!-- Property that determines if manifests need updating -->
      <uptodate property="manifests.uptodate"
          targetfile="${tomcat.manifests}/default.manifest" >
diff --git a/debian/patches/0018-fix-manager-webapp.patch b/debian/patches/0018-fix-manager-webapp.patch
index 1e3c733..8ddb2b5 100644
--- a/debian/patches/0018-fix-manager-webapp.patch
+++ b/debian/patches/0018-fix-manager-webapp.patch
@@ -6,10 +6,10 @@ Reviewed-By: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
 Last-Update: 2013-08-01
 --- a/webapps/host-manager/manager.xml
 +++ b/webapps/host-manager/manager.xml
-@@ -24,7 +24,7 @@
- -->
- 
+@@ -20,7 +20,7 @@
+     Context configuration file for the Tomcat Manager Web App
  
+ -->
 -<Context docBase="${catalina.home}/webapps/manager"
 +<Context docBase="${catalina.home}/../tomcat8-admin/manager"
           privileged="true" antiResourceLocking="false" >
@@ -28,7 +28,7 @@ Last-Update: 2013-08-01
  </Context>]]></source>
 --- a/conf/catalina.policy
 +++ b/conf/catalina.policy
-@@ -203,14 +203,14 @@
+@@ -201,14 +201,14 @@
  // - default CATALINA_HOME == CATALINA_BASE
  // - CATALINA_HOME != CATALINA_BASE, per instance Manager in CATALINA_BASE
  // - CATALINA_HOME != CATALINA_BASE, shared Manager in CATALINA_HOME

-- 
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