Author: nthykier-guest Date: 2010-02-06 11:22:13 +0000 (Sat, 06 Feb 2010) New Revision: 11507
Modified: trunk/jetty5/debian/ant.properties trunk/jetty5/debian/changelog trunk/jetty5/debian/compat trunk/jetty5/debian/control trunk/jetty5/debian/patches/sunjsse-disable.patch trunk/jetty5/debian/rules Log: New upstream release, set debhelper compat to 7, update patch so it applies, update the properties to use system jars. Modified: trunk/jetty5/debian/ant.properties =================================================================== --- trunk/jetty5/debian/ant.properties 2010-02-06 11:04:37 UTC (rev 11506) +++ trunk/jetty5/debian/ant.properties 2010-02-06 11:22:13 UTC (rev 11507) @@ -1,2 +1,3 @@ jasper-runtime.jar=/usr/share/tomcat4/common/lib/jasper-runtime.jar jasper-compiler.jar=/usr/share/tomcat4/common/lib/jasper-compiler.jar +ext=/usr/share/java/ Modified: trunk/jetty5/debian/changelog =================================================================== --- trunk/jetty5/debian/changelog 2010-02-06 11:04:37 UTC (rev 11506) +++ trunk/jetty5/debian/changelog 2010-02-06 11:22:13 UTC (rev 11507) @@ -1,5 +1,6 @@ -jetty5 (5.1.14-2) UNRELEASED; urgency=low +jetty5 (5.1.15-1) UNRELEASED; urgency=low + * New upstream release. * Renamed source package to jetty5. * Removed README.Debian - no longer relevant. Modified: trunk/jetty5/debian/compat =================================================================== --- trunk/jetty5/debian/compat 2010-02-06 11:04:37 UTC (rev 11506) +++ trunk/jetty5/debian/compat 2010-02-06 11:22:13 UTC (rev 11507) @@ -1 +1 @@ -4 +7 Modified: trunk/jetty5/debian/control =================================================================== --- trunk/jetty5/debian/control 2010-02-06 11:04:37 UTC (rev 11506) +++ trunk/jetty5/debian/control 2010-02-06 11:22:13 UTC (rev 11507) @@ -3,25 +3,27 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Niels Thykier <ni...@thykier.net> -Build-Depends: debhelper (>= 4.9.5), cdbs (>> 0.4.5.3), default-jdk -Build-Depends-Indep: java-gcj-compat-dev, ant, junit, libmx4j-java, liblog4j1.2-java, libservlet2.4-java, libcommons-logging-java, libgnumail-java +Build-Depends: ant, + cdbs (>> 0.4.5.3), + debhelper (>= 4.9.5), + default-jdk, + junit, + libcommons-logging-java, + libmx4j-java, + liblog4j1.2-java, + libservlet2.4-java Standards-Version: 3.7.2 Package: jetty Architecture: all -Depends: java-gcj-compat | java1-runtime | java2-runtime, libxerces2-java, libmx4j-java, adduser, libtomcat5.5-java, libservlet2.4-java, libcommons-logging-java, ant, apache2-utils -Suggests: libapache2-mod-jk +Depends: default-jre-headless | java2-runtime-headless | + java5-runtime-headless | java6-runtime-headless, + libcommons-logging-java, + libmx4j-java, + liblog4j1.2-java, + libservlet2.4-java Description: Java servlet engine and webserver Jetty is an Open Source HTTP Servlet Server written in 100% Java. It is designed to be light weight, high performance, embeddable, extensible and flexible, thus making it an ideal platform for serving dynamic HTTP requests from any Java application. - -Package: jetty-extra -Architecture: all -Depends: jetty, liblog4j1.2-java -Description: Extensions to jetty - Provides some extensions of jetty: - * JettyPlus: contains a number of useful facilities integrated with Jetty, - namely J2EE user transactions and DataSources, JNDI, JAAS and Log4J. - * An HTTP Loadbalancer Modified: trunk/jetty5/debian/patches/sunjsse-disable.patch =================================================================== --- trunk/jetty5/debian/patches/sunjsse-disable.patch 2010-02-06 11:04:37 UTC (rev 11506) +++ trunk/jetty5/debian/patches/sunjsse-disable.patch 2010-02-06 11:22:13 UTC (rev 11507) @@ -13,7 +13,7 @@ </target> <!-- ==================================================================== --> -@@ -181,6 +188,7 @@ +@@ -181,7 +188,8 @@ <pathelement path="${classes}"/> </classpath> <include name="**/*.java"/> @@ -23,28 +23,3 @@ </javac> </target> ---- extra/jdk1.2/build.xml.orig 2005-08-27 12:25:15.641917691 +0200 -+++ extra/jdk1.2/build.xml 2005-08-27 12:26:36.948381880 +0200 -@@ -46,6 +46,12 @@ - classpathref="extpath" - /> - <echo message="JMX available=${jmx.available}" level="info"/> -+ -+ <available property="sunjsse.available" -+ classname="com.sun.net.ssl.internal.ssl.Provider" -+ classpathref="extpath" -+ /> -+ <echo message="Sun JSSE available=${sunjsse.available}" level="info"/> - </target> - - -@@ -135,6 +142,7 @@ - <pathelement path="${classes}"/> - </classpath> - <include name="**/*.java"/> -- <exclude name="**/jmx/**" unless="jmx.available"/> -+ <exclude name="**/jmx/**"/> -+ <exclude name="**/SunJsseListener.java" unless="sunjsse.available"/> - </javac> - - </target> Modified: trunk/jetty5/debian/rules =================================================================== --- trunk/jetty5/debian/rules 2010-02-06 11:04:37 UTC (rev 11506) +++ trunk/jetty5/debian/rules 2010-02-06 11:22:13 UTC (rev 11507) @@ -6,7 +6,6 @@ include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java -#ANT_HOME := /usr/share/ant -DEB_JARS := mx4j log4j-1.2 log4j junit commons-logging gnumail +DEB_JARS := mx4j log4j-1.2 log4j junit commons-logging DEB_ANT_INSTALL_TARGET := -DEB_ANT_BUILD_TARGET := prepare jetty.jar \ No newline at end of file +DEB_ANT_BUILD_TARGET := prepare jetty.jar _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits