Author: nthykier-guest Date: 2010-01-31 13:02:36 +0000 (Sun, 31 Jan 2010) New Revision: 11454
Added: trunk/tomcat5.5/debian/libjasper-java.dirs trunk/tomcat5.5/debian/osgi.MF Removed: trunk/tomcat5.5/debian/patches/ Modified: trunk/tomcat5.5/debian/ant.properties trunk/tomcat5.5/debian/changelog trunk/tomcat5.5/debian/control trunk/tomcat5.5/debian/rules Log: Renamed src-package to jasper - Will be moved on SVN with next commit. Stripped the build rules to only handle jasper. Repacked orig.tar.gz to minimalize size and build time. Modified: trunk/tomcat5.5/debian/ant.properties =================================================================== --- trunk/tomcat5.5/debian/ant.properties 2010-01-31 09:48:08 UTC (rev 11453) +++ trunk/tomcat5.5/debian/ant.properties 2010-01-31 13:02:36 UTC (rev 11454) @@ -1,25 +1,9 @@ +jsp-api.jar=/usr/share/java/jsp-api-2.0.jar +servlet-api.jar=/usr/share/java/servlet-api-2.4.jar +#ant.home=/usr/share/ant/ +ant.jar=/usr/share/java/ant.jar compile.source=1.5 -activation.jar=/usr/share/java/activation.jar -commons-daemon.jar=/usr/share/java/commons-daemon.jar -commons-fileupload.jar=/usr/share/java/commons-fileupload.jar +compile.target=1.5 commons-logging.jar=/usr/share/java/commons-logging.jar -commons-logging-api.jar=/usr/share/java/commons-logging-api.jar -commons-modeler.jar=/usr/share/java/commons-modeler.jar -commons-launcher.jar=/usr/share/java/commons-launcher.jar commons-el.jar=/usr/share/java/commons-el.jar -commons-beanutils.jar=/usr/share/java/commons-beanutils.jar -commons-collections.jar=/usr/share/java/commons-collections3.jar -commons-digester.jar=/usr/share/java/commons-digester.jar -commons-httpclient.jar=/usr/share/java/commons-httpclient.jar -struts.lib=/usr/share/struts1.2 -xmlParserAPIs.jar=/usr/share/java/xmlParserAPIs.jar -log4j.jar=/usr/share/java/log4j-1.2.jar -mail.jar=/usr/share/java/gnumail.jar -xml-apis.jar=/usr/share/java/xml-apis.jar -xercesImpl.jar=/usr/share/java/xercesImpl.jar -jmx.jar=/usr/share/java/mx4j.jar -jmx-remote.jar=/usr/share/java/mx4j-remote.jar -junit.jar=/usr/share/java/junit.jar -execute.installer=false -jsse.jar=/usr/share/java/jsse.jar -jasper-compiler-jdt.jar=/usr/share/java/ecj.jar +jasper-compiler-jdt.jar=/usr/share/java/eclipse-ecj.jar Modified: trunk/tomcat5.5/debian/changelog =================================================================== --- trunk/tomcat5.5/debian/changelog 2010-01-31 09:48:08 UTC (rev 11453) +++ trunk/tomcat5.5/debian/changelog 2010-01-31 13:02:36 UTC (rev 11454) @@ -1,4 +1,4 @@ -tomcat5.5 (5.5.26-4) UNRELEASED; urgency=low +jasper (5.5.26-4) UNRELEASED; urgency=low * Discard all binary packages and put jasper in its own package. * Bumped debhelper compat to 7. Modified: trunk/tomcat5.5/debian/control =================================================================== --- trunk/tomcat5.5/debian/control 2010-01-31 09:48:08 UTC (rev 11453) +++ trunk/tomcat5.5/debian/control 2010-01-31 13:02:36 UTC (rev 11454) @@ -1,11 +1,18 @@ -Source: tomcat5.5 -Section: web +Source: jasper +Section: java Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Arnaud Vandyck <av...@debian.org>, Marcus Better <mar...@better.se>, Michael Koch <konque...@gmx.de>, Niels Thykier <ni...@thykier.net> -Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, -Build-Depends-Indep: libcommons-beanutils-java, libcommons-daemon-java, libcommons-digester-java, libcommons-el-java, libcommons-fileupload-java, libcommons-httpclient-java, libcommons-launcher-java, libcommons-logging-java, libcommons-modeler-java (>= 2.0), liblog4j1.2-java, libmx4j-java, libstruts1.2-java, libxerces2-java, libxalan2-java, junit, unzip, libgnumail-java +Build-Depends: ant, + cdbs, + debhelper (>= 7), + default-jdk, + javahelper (>= 0.28), + libcommons-el-java, + libcommons-logging-java, + libecj-java, + libservlet2.4-java Standards-Version: 3.7.3 Homepage: http://tomcat.apache.org Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/tomcat5.5 @@ -13,9 +20,12 @@ Package: libjasper-java Architecture: all -Section: java Depends: default-jre-headless | java2-runtime-headless | java5-runtime-headless | java6-runtime-headless, + libcommons-el-java, + libcommons-logging-java, + libecj-java, + libservlet2.4-java, ${misc:Depends} Description: Java Servlet engine -- core libraries Apache Tomcat is the reference implementation for the Java Servlet Added: trunk/tomcat5.5/debian/libjasper-java.dirs =================================================================== --- trunk/tomcat5.5/debian/libjasper-java.dirs (rev 0) +++ trunk/tomcat5.5/debian/libjasper-java.dirs 2010-01-31 13:02:36 UTC (rev 11454) @@ -0,0 +1 @@ +usr/share/java/ Added: trunk/tomcat5.5/debian/osgi.MF =================================================================== --- trunk/tomcat5.5/debian/osgi.MF (rev 0) +++ trunk/tomcat5.5/debian/osgi.MF 2010-01-31 13:02:36 UTC (rev 11454) @@ -0,0 +1,24 @@ +Bundle-ClassPath: . +Bundle-Vendor: Apache +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J + 2SE-1.3 +Bundle-Name: Apache Jasper 2 Plug-in +Bundle-SymbolicName: org.apache.jasper +Export-Package: org.apache.jasper,org.apache.jasper.compiler,org.apach + e.jasper.compiler.tagplugin,org.apache.jasper.resources,org.apache.ja + sper.runtime,org.apache.jasper.security,org.apache.jasper.servlet,org + .apache.jasper.tagplugins.jstl,org.apache.jasper.tagplugins.jstl.core + ,org.apache.jasper.util,org.apache.jasper.xmlparser +Bundle-Version: 5.5.26 +Bundle-ManifestVersion: 2 +Import-Package: javax.servlet;version="2.4",javax.servlet.http;version + ="2.4",javax.servlet.jsp;version="2.0",javax.servlet.jsp.el;version=" + 2.0",javax.servlet.jsp.resources;version="2.0",javax.servlet.jsp.tage + xt;version="2.0",javax.servlet.resources;version="2.4",javax.xml.pars + ers,org.apache.commons.el;version="[1.0.0,2.0.0)",org.apache.commons. + logging;version="[1.0.0,2.0.0)",org.apache.tools.ant;resolution:=opti + onal,org.apache.tools.ant.taskdefs;resolution:=optional,org.apache.to + ols.ant.types;resolution:=optional,org.apache.tools.ant.util;resoluti + on:=optional,org.w3c.dom,org.xml.sax,org.xml.sax.ext,org.xml.sax.help + ers Modified: trunk/tomcat5.5/debian/rules =================================================================== --- trunk/tomcat5.5/debian/rules 2010-01-31 09:48:08 UTC (rev 11453) +++ trunk/tomcat5.5/debian/rules 2010-01-31 13:02:36 UTC (rev 11454) @@ -3,19 +3,15 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -DEB_ANT_CLEAN_TARGET := -DEB_ANT_BUILD_TARGET := build -propertyfile debian/ant.properties \ - -Dbase.path=$(CURDIR)/build/tmp +DEB_ANT_CLEAN_TARGET := build-clean +DEB_ANT_BUILD_TARGET := build-prepare build-only -propertyfile debian/ant.properties DEB_ANT_INSTALL_TARGET := - JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := ant ant-launcher ant-trax xercesImpl xalan2 +DEB_JARS := ant ant-launcher ant-trax -clean:: - rm -f build-stamp - rm -rf connectors/util/build connectors/jk/jkstatus/build - rm -rf build/{build,compat,deployer,dist,tmp,embed} LICENSE - rm -rf servletapi/{jsr152,jsr154}/{build,dist} - dh_clean +install/libjasper-java:: + cd build/shared/classes/ && zip -r ../../jasper.jar * + jar umf debian/osgi.MF build/jasper.jar + jh_installlibs -p$(cdbs_curpkg) build/jasper.jar _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits