CVS jetty/debian

[Philipp Meier]

Update of /cvsroot/pkg-java/jetty/debian
In directory haydn:/tmp/cvs-serv31851

Modified Files:
	changelog control files jetty.init jetty.preinst rules 
	start.config 
Log Message:
jetty (5.1.5rc1-3) unstable; urgency=low

  * Removed -v from ant opts during build.
  * Remove pid file on stop. Closes: #325667
  * Fix location of ant-1.6.jar in start.config. Closes: #324472.

 -- Philipp Meier <meier at fnogol.de>  Tue, 30 Aug 2005 13:37:15 +0200

jetty (5.1.5rc1-2) unstable; urgency=low

  * Builds with kaffe.
  * Adds patch to exclude Sun JSSE if not available.

 -- Philipp Meier <meier at fnogol.de>  Sat, 27 Aug 2005 14:21:12 +0200

jetty (5.1.5rc1-1) unstable; urgency=low

  * New upstream release

 -- Philipp Meier <meier at fnogol.de>  Fri, 26 Aug 2005 12:53:50 +0200



--- /cvsroot/pkg-java/jetty/debian/changelog	2005/08/20 13:37:53	1.4
+++ /cvsroot/pkg-java/jetty/debian/changelog	2005/08/30 12:32:22	1.5
@@ -1,3 +1,24 @@
+jetty (5.1.5rc1-3) unstable; urgency=low
+
+  * Removed -v from ant opts during build.
+  * Remove pid file on stop. Closes: #325667
+  * Fix location of ant-1.6.jar in start.config. Closes: #324472.
+
+ -- Philipp Meier <meier at fnogol.de>  Tue, 30 Aug 2005 13:37:15 +0200
+
+jetty (5.1.5rc1-2) unstable; urgency=low
+
+  * Builds with kaffe.
+  * Adds patch to exclude Sun JSSE if not available.
+
+ -- Philipp Meier <meier at fnogol.de>  Sat, 27 Aug 2005 14:21:12 +0200
+
+jetty (5.1.5rc1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Philipp Meier <meier at fnogol.de>  Fri, 26 Aug 2005 12:53:50 +0200
+
 jetty (5.1.4-1) unstable; urgency=low
 
   * New upstream release
--- /cvsroot/pkg-java/jetty/debian/control	2005/08/20 13:37:53	1.4
+++ /cvsroot/pkg-java/jetty/debian/control	2005/08/30 12:32:22	1.5
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Philipp Meier <meier at fnogol.de>
-Build-Depends-Indep: j2sdk1.3 | j2sdk1.4 | j2sdk1.5, debhelper (>= 4.9.5), ant, junit, libmx4j-java, liblog4j1.2-java, libservlet2.4-java, libtomcat4-java, libcommons-logging-java, cdbs ( >>0.4.5.3)
+Build-Depends-Indep: j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe (>= 2:1.1.5-5), debhelper (>= 4.9.5), ant, junit, libmx4j-java, liblog4j1.2-java, libservlet2.4-java, libtomcat4-java, libcommons-logging-java, cdbs ( >>0.4.5.3)
 Standards-Version: 3.6.2
 
 Package: jetty
 Architecture: all
-Depends: java-virtual-machine | j2re1.3 | j2sdk1.3 | j2re1.4 | j2re1.5 | j2sdk1.4 | sun-j2sdk.1.5 | java2-runtime, jikes | j2sdk1.3 | j2sdk1.4 | java2-compiler , libxerces2-java, libtomcat4-java, libmx4j-java, adduser, libservlet2.4-java, libcommons-logging-java
+Depends: java-virtual-machine | j2re1.3 | j2sdk1.3 | j2re1.4 | j2re1.5 | j2sdk1.4 | sun-j2sdk.1.5 | java2-runtime | kaffe (>= 2:1.1.5-5), jikes | j2sdk1.3 | j2sdk1.4 | java2-compiler | kaffe (>= 2:1.1.5-5), libxerces2-java, libtomcat4-java, libmx4j-java, adduser, libservlet2.4-java, libcommons-logging-java, libant1.6-java
 Suggests: libapache2-mod-webapp | libapache-mod-jk
 Description: Java servlet engine and webserver
  Jetty is an Open Source HTTP Servlet Server written in 100% Java.
--- /cvsroot/pkg-java/jetty/debian/files	2005/08/06 16:07:21	1.2
+++ /cvsroot/pkg-java/jetty/debian/files	2005/08/30 12:32:22	1.3
@@ -1,2 +1,2 @@
-jetty_5.1.4-1_all.deb contrib/web optional
-jetty-extra_5.1.4-1_all.deb contrib/web optional
+jetty_5.1.5rc1-3_all.deb contrib/web optional
+jetty-extra_5.1.5rc1-3_all.deb contrib/web optional
--- /cvsroot/pkg-java/jetty/debian/jetty.init	2005/08/06 16:07:21	1.2
+++ /cvsroot/pkg-java/jetty/debian/jetty.init	2005/08/30 12:32:22	1.3
@@ -132,7 +132,7 @@
 		start-stop-daemon --quiet --stop \
 			--pidfile "$PIDFILE" --user "$JETTY_USER" \
 			--startas "$JAVA" > /dev/null
-                while ! start-stop-daemon --quiet --test --start \
+                while ! start-stop-daemon --quiet --test --stop \
 			--pidfile "$PIDFILE" --user "$JETTY_USER" \
 			--startas "$JAVA" > /dev/null; do 
                         sleep 1
--- /cvsroot/pkg-java/jetty/debian/jetty.preinst	2004/11/05 21:24:21	1.1.1.1
+++ /cvsroot/pkg-java/jetty/debian/jetty.preinst	2005/08/30 12:32:22	1.2
@@ -16,6 +16,10 @@
 
 
 case "$1" in
+    upgrade)
+
+    ;;
+
     install|upgrade)
     ;;
 
--- /cvsroot/pkg-java/jetty/debian/rules	2005/08/06 16:07:21	1.2
+++ /cvsroot/pkg-java/jetty/debian/rules	2005/08/30 12:32:22	1.3
@@ -6,6 +6,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME_DIRS		:= \
+                           /usr/lib/kaffe \
 			   /usr/lib/j2sdk1.5-sun \
 			   /usr/lib/j2sdk1.4-sun \
 			   /usr/lib/j2sdk1.4 \
--- /cvsroot/pkg-java/jetty/debian/start.config	2005/08/06 16:07:21	1.2
+++ /cvsroot/pkg-java/jetty/debian/start.config	2005/08/30 12:32:22	1.3
@@ -81,7 +81,7 @@
 $(java.lib.home)/jmxri.jar                       ! available javax.management.MBeanServer
 $(tomcat.lib.home)/jasper-runtime.jar            ! available org.apache.jasper.Constants
 $(tomcat.lib.home)/jasper-compiler.jar           ! available org.apache.jasper.JspCompilationContext
-$(java.lib.home)/ant.jar                         ! available org.apache.tools.ant.BuildException
+$(java.lib.home)/ant-1.6.jar                         ! available org.apache.tools.ant.BuildException
 $(java.home)/lib/tools.jar                       ! available com.sun.tools.javac.Main
 $(java.home)/../lib/tools.jar                    ! available com.sun.tools.javac.Main