[pkg-java] r2756 - branches/tomcat5.5/feature/debian/debian

[Marcus Better]

Author: marcusb-guest
Date: 2006-11-15 12:05:19 +0100 (Wed, 15 Nov 2006)
New Revision: 2756

Modified:
   branches/tomcat5.5/feature/debian/debian/rules
Log:
Cleanup.


Modified: branches/tomcat5.5/feature/debian/debian/rules
===================================================================
--- branches/tomcat5.5/feature/debian/debian/rules	2006-11-15 10:45:48 UTC (rev 2755)
+++ branches/tomcat5.5/feature/debian/debian/rules	2006-11-15 11:05:19 UTC (rev 2756)
@@ -1,13 +1,6 @@
 #!/usr/bin/make -f
 # debian/rules file for tomcat5.5 (uses cdbs)
 
-UPSTREAM_VERSION   := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-)
-TOMCAT_SRCDIR      := build
-TOMCAT_BUILD       := build/build
-CATALINA_SRCDIR    := container
-CONNECTORS_SRCDIR  := connectors
-JASPER_SRCDIR     := jasper
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
@@ -15,11 +8,13 @@
 ANT_HOME  := /usr/share/ant
 ANT_ARGS := -Dbase.path=$(CURDIR)/build/tmp
 
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar xercesImpl xalan2
+DEB_JARS := ant-launcher ant-trax xercesImpl xalan2
 
 DEB_ANT_BUILD_TARGET   := build
 DEB_ANT_CLEAN_TARGET   := xxx
 
+TOMCAT_SRCDIR      := build
+
 # Examples and documentation for the tomcat5.5 package
 DEB_INSTALL_DOCS_tomcat5.5 := $(DEB_SRCDIR)/$(TOMCAT_SRCDIR)/RUNNING.txt
 DEB_INSTALL_EXAMPLES_tomcat5.5 := $(DEB_SRCDIR)/$(TOMCAT_SRCDIR)/build/conf/server.xml \