[tomcat7] 02/02: New upstream release, patch refresh

Gianfranco Costamagna locutusofborg-guest at alioth.debian.org
Tue Oct 22 16:05:10 UTC 2013 

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

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

commit cebd039060568e6437ff74e4a95a9d61ab14d4fa
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Oct 22 15:06:02 2013 +0200

    New upstream release, patch refresh
---
 debian/changelog                                             |    8 ++++++++
 ...0004-split-deploy-webapps-target-from-deploy-target.patch |    4 ++--
 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 +-
 .../{fix-manager-webapp.path => fix-manager-webapp.patch}    |    2 +-
 debian/patches/series                                        |    2 +-
 7 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac3e29a..ea35038 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tomcat7 (7.0.47-1) UNRELEASED; urgency=low
+
+  * New upstream release, patch refresh.
+  * Renamed patch fix-manager-webapp.path
+    to fix-manager-webapp.patch (extension typo).
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Tue, 22 Oct 2013 15:04:35 +0200
+
 tomcat7 (7.0.45-1) UNRELEASED; urgency=low
 
   * New upstream release, patch refresh.
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 c1f3bf7..2497ede 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
@@ -8,7 +8,7 @@ Subject: [PATCH] split deploy-webapps target from deploy target
 
 --- a/build.xml
 +++ b/build.xml
-@@ -909,7 +909,7 @@
+@@ -910,7 +910,7 @@
      </xslt>
    </target>
  
@@ -17,7 +17,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"
-@@ -947,6 +947,10 @@
+@@ -948,6 +948,10 @@
        </fileset>
      </copy>
  
diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index b8e5464..b5bee16 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
-@@ -575,7 +575,7 @@
+@@ -576,7 +576,7 @@
    <target name="compile" depends="compile-java6,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}"
-@@ -912,12 +912,14 @@
+@@ -913,12 +913,14 @@
    <target name="deploy" depends="package,build-docs,deploy-webapps"
            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 bc74437..a49afa9 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: 2011-05-16
 
 --- a/build.xml
 +++ b/build.xml
-@@ -729,7 +729,8 @@
+@@ -730,7 +730,8 @@
      <!-- Jasper Implementation JAR File -->
      <jarIt jarfile="${jasper.jar}"
        filesDir="${tomcat.classes}"
@@ -15,7 +15,7 @@ Last-Update: 2011-05-16
  
      <!-- Jasper EL Implementation JAR File -->
      <jarIt jarfile="${jasper-el.jar}"
-@@ -737,8 +738,7 @@
+@@ -738,8 +739,7 @@
        filesId="files.jasper-el" />
  
      <!-- i18n JARs -->
@@ -25,7 +25,7 @@ Last-Update: 2011-05-16
        <fileset dir="${tomcat.classes}">
          <include name="**/LocalStrings_es.properties" />
        </fileset>
-@@ -746,9 +746,8 @@
+@@ -747,9 +747,8 @@
          fullpath="META-INF/NOTICE" />
        <zipfileset file="${tomcat.manifests}/default.license"
          fullpath="META-INF/LICENSE" />
@@ -37,7 +37,7 @@ Last-Update: 2011-05-16
        <fileset dir="${tomcat.classes}">
          <include name="**/LocalStrings_fr.properties" />
        </fileset>
-@@ -756,9 +755,8 @@
+@@ -757,9 +756,8 @@
          fullpath="META-INF/NOTICE" />
        <zipfileset file="${tomcat.manifests}/default.license"
          fullpath="META-INF/LICENSE" />
@@ -49,7 +49,7 @@ Last-Update: 2011-05-16
        <fileset dir="${tomcat.classes}">
          <include name="**/LocalStrings_ja.properties" />
        </fileset>
-@@ -766,7 +764,7 @@
+@@ -767,7 +765,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 ae5b6f5..895849c 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
-@@ -448,7 +448,6 @@
+@@ -449,7 +449,6 @@
      <!-- Property that determines if manifests need updating -->
      <uptodate property="manifests.uptodate"
          targetfile="${tomcat.manifests}/default.manifest" >
diff --git a/debian/patches/fix-manager-webapp.path b/debian/patches/fix-manager-webapp.patch
similarity index 99%
rename from debian/patches/fix-manager-webapp.path
rename to debian/patches/fix-manager-webapp.patch
index c054370..8875f5e 100644
--- a/debian/patches/fix-manager-webapp.path
+++ b/debian/patches/fix-manager-webapp.patch
@@ -30,7 +30,7 @@ Last-Update: <2013-08-01>
  </Context>
 --- a/conf/catalina.policy
 +++ b/conf/catalina.policy
-@@ -197,14 +197,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
diff --git a/debian/patches/series b/debian/patches/series
index 1821c71..e63c4be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,4 @@
 0014-JDTCompiler.patch
 0015_disable_test_TestCometProcessor.patch
 0017-use-jdbc-pool-default.patch
-fix-manager-webapp.path
+fix-manager-webapp.patch

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