CVS tomcat5/debian

[Arnaud Vandyck]

Update of /cvsroot/pkg-java/tomcat5/debian
In directory haydn:/tmp/cvs-serv21790

Modified Files:
	ant.properties control rules 
Log Message:
new progresses, new patches, new build-deps

--- /cvsroot/pkg-java/tomcat5/debian/ant.properties	2005/03/25 15:03:27	1.1.1.1
+++ /cvsroot/pkg-java/tomcat5/debian/ant.properties	2005/05/14 12:32:06	1.2
@@ -9,11 +9,13 @@
 commons-logging-api.jar=/usr/share/java/commons-logging.jar
 commons-modeler.jar=/usr/share/java/commons-modeler.jar
 commons-pool.jar=/usr/share/java/commons-pool.jar
-servlet.jar=./jakarta-servletapi-5/jsr154/debian/tmp/servlet-api-2.4/lib/servlet-api.jar
+commons-el.jar=/usr/share/java/commons-el.jar
+servlet-api.jar=/usr/share/java/servlet-api.jar
+jsp-api.jar=/usr/share/java/jsp-api.jar
 struts.jar=/usr/share/struts1.2/struts.jar
 xmlParserAPIs.jar=/usr/share/java/xmlParserAPIs.jar
 commons-daemon.jar=/usr/share/java/commons-daemon.jar
-commons-launcher.jar=/usr/share/java/commons-daemon.jar
+commons-launcher.jar=/usr/share/java/commons-launcher.jar
 log4j.jar=/usr/share/java/log4j-1.2.jar
 mail.jar=/usr/share/java/gnumail.jar
 regexp.jar=/usr/share/java/regexp.jar
@@ -22,3 +24,9 @@
 jmx.jar=/usr/share/java/mx4j.jar
 junit.jar=/usr/share/java/junit.jar
 commons-httpclient.jar=/usr/share/java/commons-httpclient.jar
+saxpath.jar=/usr/share/java/saxpath.jar
+jaxen.jar=/usr/share/java/jaxen-core.jar
+execute.installer=false
+jsse.jar=/usr/share/java/jsse.jar
+puretls.jar=
+puretls.present=false
--- /cvsroot/pkg-java/tomcat5/debian/control	2005/03/25 15:03:27	1.1.1.1
+++ /cvsroot/pkg-java/tomcat5/debian/control	2005/05/14 12:32:06	1.2
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Stefan Gybas <sgybas@debian.org>, Arnaud Vandyck <avdyk@debian.org>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.1.0), kaffe, libant1.6-java, libregexp-java, libcommons-beanutils-java, libcommons-collections-java, libcommons-fileupload-java (>= 1.0-1), libcommons-digester-java, libcommons-logging-java, libcommons-modeler-java (>= 1.1-1), libmx4j-java,  libcommons-dbcp-java, libstruts1.2-java, libgnujaf-java, libgnumail-java, libcommons-daemon-java, liblog4j1.2-java, libxerces2-java, junit, libcommons-httpclient-java
+Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.1.0), kaffe, libant1.6-java, libregexp-java, libcommons-beanutils-java, libcommons-collections-java, libcommons-fileupload-java (>= 1.0-1), libcommons-digester-java, libcommons-logging-java, libcommons-modeler-java (>= 1.1-1), libmx4j-java,  libcommons-dbcp-java, libstruts1.2-java, libgnujaf-java, libgnumail-java, libcommons-daemon-java, liblog4j1.2-java, libxerces2-java, libxalan2-java, junit, libcommons-httpclient-java, libsaxpath-java, libjaxen-java, libcommons-el-java, libjessie-java, libcommons-launcher-java
 Standards-Version: 3.6.1
 
 Package: tomcat5
--- /cvsroot/pkg-java/tomcat5/debian/rules	2005/03/25 15:03:27	1.1.1.1
+++ /cvsroot/pkg-java/tomcat5/debian/rules	2005/05/14 12:32:06	1.2
@@ -45,7 +45,10 @@
 	mkdir -p jakarta-commons/daemon/target
 	ln -s /usr/share/java/commons-daemon.jar jakarta-commons/daemon/target/commons-daemon.jar
 	mkdir debian/tmp
+	-rm jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13*
+	-rm -r jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/puretls/
 #	ln -s $(CONNECTORS_SRCDIR) $(_cdbs_tarball_dir)/jakarta-tomcat-connectors
 
 clean::
 	-rm jakarta-commons/daemon/target/commons-daemon.jar
+	-rm -r jakarta-tomcat-5/debian