[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Working on tomcat 5.5.x



What wonderful timing - I was in need of a tomcat 5.5 package too.

I'm very new to the whole Java lark, so take this with a pinch of
salt, but I've attached a short diff with a few changes that helped
here.

1) added commons-el.jar to known jarfiles
2) added libcommons-el-java, libxalan2-java to build-deps
3) corrected spelling of Architecture for libsevlet2.4-java
4) forced creation of symlink

I'm having to build with "debian/rules binary" because
dpkg-buildpackage calls the clean target which wipes out the build
directory and causes it to extract from SVN :-(

If you run the binary target twice in a row it aborts trying to create
the symlink, hence that forth patch.

I'm not subscribed, but will be checking this thread FWIW.

Cheers,

Adrian
diff -Naur debian.orig/ant.properties debian/ant.properties
--- debian.orig/ant.properties	2006-01-11 15:57:23.000000000 +0000
+++ debian/ant.properties	2006-01-11 15:45:07.000000000 +0000
@@ -4,6 +4,7 @@
 commons-collections.jar=/usr/share/java/commons-collections.jar
 commons-digester.jar=/usr/share/java/commons-digester.jar
 commons-dbcp.jar=/usr/share/java/commons-dbcp.jar
+commons-el.jar=/usr/share/java/commons-el.jar
 commons-fileupload.jar=/usr/share/java/commons-fileupload.jar
 commons-logging.jar=/usr/share/java/commons-logging.jar
 commons-logging-api.jar=/usr/share/java/commons-logging.jar
diff -Naur debian.orig/control debian/control
--- debian.orig/control	2006-01-11 14:47:31.000000000 +0000
+++ debian/control	2006-01-11 15:57:01.000000000 +0000
@@ -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, junit, libcommons-httpclient-java, libcommons-el-java, libxalan2-java
 Standards-Version: 3.6.1
 
 Package: tomcat5
@@ -82,7 +82,7 @@
  home page at http://jakarta.apache.org/tomcat/index.html.
 
 Package: libservlet2.4-java
-Architecure: all
+Architecture: all
 Section: contrib/web
 Priority: optional
 Depends: sablevm | gij | kaffe (>= 2:1.1.4) | java1-runtime | java2-runtime
diff -Naur debian.orig/rules debian/rules
--- debian.orig/rules	2006-01-11 16:01:24.000000000 +0000
+++ debian/rules	2006-01-11 15:53:45.000000000 +0000
@@ -43,7 +43,7 @@
 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
+	ln -sf /usr/share/java/commons-daemon.jar jakarta-commons/daemon/target/commons-daemon.jar
 	mkdir debian/tmp
 #	ln -s $(CONNECTORS_SRCDIR) $(_cdbs_tarball_dir)/jakarta-tomcat-connectors
 

Reply to: