[Libreoffice-commits] core.git: download.lst tomcat/ExternalProject_tomcat.mk tomcat/Package_tomcat.mk tomcat/UnpackedTarball_tomcat.mk

[Caolán McNamara]

 download.lst                     |    2 +-
 tomcat/ExternalProject_tomcat.mk |    2 +-
 tomcat/Package_tomcat.mk         |    2 +-
 tomcat/UnpackedTarball_tomcat.mk |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4f2890a8c9a0c8cadeb469b8b6e23ea7ec3f3b81
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 28 19:05:58 2013 +0100

    bump tomcat to 5.5.36
    
    Change-Id: I04e5a96cb7fb5e7b8955a98eae2fdc01d4caa798

diff --git a/download.lst b/download.lst
index 858d707..9c5c4bc 100644
--- a/download.lst
+++ b/download.lst
@@ -81,7 +81,7 @@ export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
 export REDLAND_TARBALL := 32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
 export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-export TOMCAT_TARBALL := 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
+export TOMCAT_TARBALL := 63574e3ada44f473892a61a2da433a59-apache-tomcat-5.5.36-src.tar.gz
 export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 export VIGRA_TARBALL := ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
 export WPD_TARBALL := 972afb8fdf02d9e7517e258b7fa7f0eb-libwpd-0.9.8.tar.bz2
diff --git a/tomcat/ExternalProject_tomcat.mk b/tomcat/ExternalProject_tomcat.mk
index 0640f4b..e4f3ff1 100644
--- a/tomcat/ExternalProject_tomcat.mk
+++ b/tomcat/ExternalProject_tomcat.mk
@@ -25,6 +25,6 @@ $(call gb_ExternalProject_get_state_target,tomcat,build) :
 				 -Dant.build.javac.target=$(JAVA_TARGET_VER) \
 			) \
 			$(if $(debug),-Dbuild.debug="on") \
-	,jakarta-servletapi-5)
+	,servletapi)
 
 # vim: set noet sw=4 ts=4:
diff --git a/tomcat/Package_tomcat.mk b/tomcat/Package_tomcat.mk
index 8cd4512..1ab9c5c 100644
--- a/tomcat/Package_tomcat.mk
+++ b/tomcat/Package_tomcat.mk
@@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,tomcat_inc,$(call gb_UnpackedTarball_get_dir,to
 
 $(eval $(call gb_Package_use_external_project,tomcat_inc,tomcat))
 
-$(eval $(call gb_Package_add_file,tomcat_inc,bin/servlet-api.jar,jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar))
+$(eval $(call gb_Package_add_file,tomcat_inc,bin/servlet-api.jar,servletapi/jsr154/dist/lib/servlet-api.jar))
 
 # vim: set noet sw=4 ts=4:
diff --git a/tomcat/UnpackedTarball_tomcat.mk b/tomcat/UnpackedTarball_tomcat.mk
index 6e6a716..ed408f1 100644
--- a/tomcat/UnpackedTarball_tomcat.mk
+++ b/tomcat/UnpackedTarball_tomcat.mk
@@ -12,6 +12,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,tomcat))
 $(eval $(call gb_UnpackedTarball_set_tarball,tomcat,$(TOMCAT_TARBALL)))
 
 
-$(eval $(call gb_UnpackedTarball_add_file,tomcat,jakarta-servletapi-5/build.xml,tomcat/build.xml))
+$(eval $(call gb_UnpackedTarball_add_file,tomcat,servletapi/build.xml,tomcat/build.xml))
 
 # vim: set noet sw=4 ts=4: