CVS tomcat5/debian

[Arnaud Vandyck]

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

Modified Files:
	ant.properties control rules 
Log Message:
now it builds but the package is not done yet

--- /cvsroot/pkg-java/tomcat5/debian/ant.properties	2005/05/14 12:32:06	1.2
+++ /cvsroot/pkg-java/tomcat5/debian/ant.properties	2005/06/03 20:43:28	1.3
@@ -12,6 +12,7 @@
 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.lib=/usr/share/struts1.2
 struts.jar=/usr/share/struts1.2/struts.jar
 xmlParserAPIs.jar=/usr/share/java/xmlParserAPIs.jar
 commons-daemon.jar=/usr/share/java/commons-daemon.jar
--- /cvsroot/pkg-java/tomcat5/debian/control	2005/05/14 12:32:06	1.2
+++ /cvsroot/pkg-java/tomcat5/debian/control	2005/06/03 20:43:28	1.3
@@ -8,8 +8,6 @@
 
 Package: tomcat5
 Architecture: all
-Section: contrib/web
-Priority: optional
 Depends: j2sdk1.4 | j2sdk1.3 | kaffe (>= 1.1.3) | java-virtual-machine, j2sdk1.4 | j2sdk1.3 | kaffe | java-compiler, libtomcat5-java (>= ${Source-Version}), adduser (>= 3.34), apache-utils (>= 1.3.29.0.2-1) | apache2-common, ${misc:Depends}
 Suggests: libapache-mod-jk, tomcat5-webapps, tomcat5-admin, ant
 Description: Java Servlet 2.4 engine with JSP 2.0 support
@@ -33,8 +31,6 @@
 
 Package: libtomcat5-java
 Architecture: all
-Section: contrib/web
-Priority: optional
 Depends: libxerces2-java, libservlet2.4-java, libant1.6-java, libregexp-java, libcommons-beanutils-java, libcommons-collections-java, libcommons-digester-java, libcommons-fileupload-java (>= 1.0-1), libcommons-logging-java, libcommons-modeler-java (>= 1.1-1), libmx4j-java, libcommons-dbcp-java, libcommons-daemon-java
 Suggests: tomcat5
 Description: Java Servlet engine -- core libraries
@@ -50,8 +46,6 @@
 
 Package: tomcat5-webapps
 Architecture: all
-Section: contrib/web
-Priority: optional
 Depends: tomcat5 (>= ${Source-Version})
 Description: Java Servlet engine -- documentation and example web applications
  Apache Tomcat 5 is the reference implementation for the Java Servlet 2.4
@@ -68,8 +62,6 @@
 
 Package: tomcat5-admin
 Architecture: all
-Section: contrib/web
-Priority: optional
 Depends: tomcat5 (>= ${Source-Version}), libstruts1.1-java
 Description: Java Servlet engine -- admin web interfaces
  Apache Tomcat 5 is the reference implementation for the Java Servlet 2.4
@@ -80,14 +72,3 @@
  .
  For more information about Tomcat please take a look at the Tomcat
  home page at http://jakarta.apache.org/tomcat/index.html.
-
-Package: libservlet2.4-java
-Architecure: all
-Section: contrib/web
-Priority: optional
-Depends: sablevm | gij | kaffe (>= 2:1.1.4) | java1-runtime | java2-runtime
-Description: servlet 2.4  reference api
- bla servlet bla bla 2.4 blablabla reference
- .
- For more information about Tomcat please take a look at the Tomcat
- home page at http://jakarta.apache.org/tomcat/index.html.
--- /cvsroot/pkg-java/tomcat5/debian/rules	2005/05/14 12:32:06	1.2
+++ /cvsroot/pkg-java/tomcat5/debian/rules	2005/06/03 20:43:28	1.3
@@ -36,19 +36,25 @@
 #DEB_ANT_INSTALL_TARGET := dist
 
 # Examples and documentation for the tomcat5 package
-DEB_INSTALL_DOCS_tomcat5 := $(DEB_SRCDIR)/README.txt $(DEB_SRCDIR)/RELEASE-NOTES-*.txt $(DEB_SRCDIR)/RUNNING.txt
-DEB_INSTALL_EXAMPLES_tomcat5 := $(DEB_SRCDIR)/build/conf/server.xml $(DEB_SRCDIR)/build/conf/web.xml
+DEB_INSTALL_DOCS_tomcat5 := $(DEB_SRCDIR)/$(TOMCAT_SRCDIR)/RELEASE-* \
+	$(DEB_SRCDIR)/$(TOMCAT_SRCDIR)/RUNNING.txt # $(DEB_SRCDIR)/README.txt 
+DEB_INSTALL_EXAMPLES_tomcat5 := $(DEB_SRCDIR)/$(TOMCAT_SRCDIR)/build/conf/server.xml \
+	$(DEB_SRCDIR)/$(TOMCAT_SRCDIR)/build/conf/web.xml
 
 
 pre-build:: #$(_cdbs_tarball_dir)/jakarta-tomcat
 #$(_cdbs_tarball_dir)/jakarta-tomcat:
-	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*
+	-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
+	-rm -r jakarta-tomcat-5/build
+	-rm -r jakarta-tomcat-5/compat
+	-rm -r jakarta-tomcat-5/deployer
+	-rm -r jakarta-tomcat-catalina/webapps/build/