[pkg-java] r3907 - trunk/jetty/debian

mkoch at alioth.debian.org mkoch at alioth.debian.org
Tue Jul 24 18:53:57 UTC 2007 

Author: mkoch
Date: 2007-07-24 18:53:56 +0000 (Tue, 24 Jul 2007)
New Revision: 3907

Modified:
   trunk/jetty/debian/
   trunk/jetty/debian/changelog
   trunk/jetty/debian/control
   trunk/jetty/debian/jetty.init
   trunk/jetty/debian/jetty.install
   trunk/jetty/debian/rules
   trunk/jetty/debian/start.config
Log:
jetty (5.1.10-3) unstable; urgency=low

  * Fix debian/jetty.init to permit removal without purge and offer a new
    NO_START option in /etc/default/jetty. Closes: #356067.
    Thanks to Loic Minier for the patch.
  * Added additional paths to JDK_DIRS in debian/jetty.init.
    Closes: #405851.
  * (Build-)Depends on java-gcj-compat.
  * Moved debhelper from Build-Depends-Indep to Build-Depends.
  * Removed Build-Depends on libtomcat5-java and replace Depends on
    libtomcat5-java by libtomcat5.5-java.
  * Added LSB section in debian/jetty.init.
  * Removed extra license file from /usr/share/doc/jetty.
  * Added myself to Uploaders.

 -- Michael Koch <konqueror at gmx.de>  Tue, 24 Jul 2007 20:40:27 +0200




Property changes on: trunk/jetty/debian
___________________________________________________________________
Name: svn:ignore
   - stamp-*
*.debhelper

   + files
jetty
jetty-extra
stamp-*
*.debhelper


Modified: trunk/jetty/debian/changelog
===================================================================
--- trunk/jetty/debian/changelog	2007-07-24 14:40:29 UTC (rev 3906)
+++ trunk/jetty/debian/changelog	2007-07-24 18:53:56 UTC (rev 3907)
@@ -1,3 +1,20 @@
+jetty (5.1.10-3) unstable; urgency=low
+
+  * Fix debian/jetty.init to permit removal without purge and offer a new
+    NO_START option in /etc/default/jetty. Closes: #356067.
+    Thanks to Loic Minier for the patch.
+  * Added additional paths to JDK_DIRS in debian/jetty.init.
+    Closes: #405851.
+  * (Build-)Depends on java-gcj-compat.
+  * Moved debhelper from Build-Depends-Indep to Build-Depends.
+  * Removed Build-Depends on libtomcat5-java and replace Depends on
+    libtomcat5-java by libtomcat5.5-java.
+  * Added LSB section in debian/jetty.init.
+  * Removed extra license file from /usr/share/doc/jetty.
+  * Added myself to Uploaders.
+
+ -- Michael Koch <konqueror at gmx.de>  Tue, 24 Jul 2007 20:40:27 +0200
+
 jetty (5.1.10-2) unstable; urgency=low
 
   * Fix in init script for new version of su (closes #367491).

Modified: trunk/jetty/debian/control
===================================================================
--- trunk/jetty/debian/control	2007-07-24 14:40:29 UTC (rev 3906)
+++ trunk/jetty/debian/control	2007-07-24 18:53:56 UTC (rev 3907)
@@ -2,15 +2,15 @@
 Section: contrib/web
 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 | kaffe (>= 2:1.1.5-5), debhelper (>= 4.9.5), ant, junit, libmx4j-java, liblog4j1.2-java, libservlet2.4-java, libtomcat5-java, libcommons-logging-java 
-Build-Depends: cdbs (>>0.4.5.3)
+Uploaders: Philipp Meier <meier at fnogol.de>, Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>= 4.9.5), cdbs (>> 0.4.5.3)
+Build-Depends-Indep: java-gcj-compat-dev, ant, junit, libmx4j-java, liblog4j1.2-java, libservlet2.4-java, libcommons-logging-java 
 Standards-Version: 3.7.2
 
 Package: jetty
 Architecture: all
-Depends: kaffe (>= 2:1.1.5-5) | j2re1.3 | j2sdk1.3 | j2re1.4 | j2re1.5 | j2sdk1.4 | sun-j2sdk.1.5 | java-virtual-machine | java2-runtime , jikes | j2sdk1.3 | j2sdk1.4 | j2sdk1.5  | java2-compiler, libxerces2-java, libtomcat5-java, libmx4j-java, adduser, libservlet2.4-java, libcommons-logging-java, ant, apache2-utils
-Suggests: libapache2-mod-webapp | libapache-mod-jk
+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-webapp | libapache2-mod-jk
 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,

Modified: trunk/jetty/debian/jetty.init
===================================================================
--- trunk/jetty/debian/jetty.init	2007-07-24 14:40:29 UTC (rev 3906)
+++ trunk/jetty/debian/jetty.init	2007-07-24 18:53:56 UTC (rev 3907)
@@ -3,14 +3,31 @@
 # /etc/init.d/jetty -- startup script for jetty 4.2.11
 #
 # Written by Philipp Meier <meier at meisterbohne.de>
+#
+### BEGIN INIT INFO
+# Provides:          jetty
+# Required-Start:    $syslog $network
+# Required-Stop:     $syslog $network
+# Should-Start:      $local_fs
+# Should-Stop:       $local_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Generate xfree86 configuration at boot time
+# Description:       Preseed X configuration and use dexconf to
+#                    generate a new configuration file.
+### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 NAME=jetty
 DESC="Jetty servlet engine"
 JETTY_HOME=/usr/share/$NAME
+START_JAR="$JETTY_HOME/lib/start.jar"
 
 # The following variables can be overwritten in /etc/default/jetty
-                                                                                
+
+# Whether to start jetty (as a daemon) or not
+NO_START=0
+
 # Run Jetty as this user ID (default: jetty)
 # Set this to an empty string to prevent Jetty from starting automatically
 JETTY_USER=jetty
@@ -18,6 +35,10 @@
 # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
 # defined in /etc/default/jetty)
 JDK_DIRS="
+	  /usr/lib/jvm/java-6-sun \
+	  /usr/lib/jvm/java-1.5.0-sun \
+	  /usr/lib/jvm/java-gcj \
+          /usr/lib/j2sdk1.6-sun \
           /usr/lib/j2sdk1.5-sun \
           /usr/lib/j2sdk1.4-sun \
 	  /usr/lib/j2sdk1.4 \
@@ -43,6 +64,20 @@
         . /etc/default/jetty
 fi
 
+# Check whether jetty is still installed (it might not be if this package was
+# removed and not purged)
+if [ -r "$START_JAR" ]; then
+    HAVE_JETTY=1
+else
+    exit 0
+fi
+
+# Check whether startup has been disabled
+if [ "$NO_START" != "0" -a "$1" != "stop" ]; then 
+        [ "$VERBOSE" != "no" ] && echo "Not starting jetty - edit /etc/default/jetty and change NO_START to be 0 (or comment it out).";
+        exit 0;
+fi
+
 if [ -z "$JETTY_USER" ]; then
         echo "Not starting/stopping $DESC as configured (JETTY_USER is"
         echo "empty in /etc/default/jetty)."
@@ -85,7 +120,7 @@
 
 fi
 
-ARGUMENTS="$JAVA_OPTIONS -DSTART=$START_CONFIG -Djetty.home=$JETTY_HOME -jar /usr/share/jetty/lib/start.jar /etc/jetty/jetty.xml"
+ARGUMENTS="$JAVA_OPTIONS -DSTART=$START_CONFIG -Djetty.home=$JETTY_HOME -jar $START_JAR /etc/jetty/jetty.xml"
 
 ##################################################
 # Do the action

Modified: trunk/jetty/debian/jetty.install
===================================================================
--- trunk/jetty/debian/jetty.install	2007-07-24 14:40:29 UTC (rev 3906)
+++ trunk/jetty/debian/jetty.install	2007-07-24 18:53:56 UTC (rev 3907)
@@ -9,6 +9,5 @@
 demo/webapps/jetty/*			usr/share/jetty/webapps/root
 README.TXT				usr/share/doc/jetty
 VERSION.TXT				usr/share/doc/jetty
-LICENSE.TXT				usr/share/doc/jetty
 javadoc/*				usr/share/doc/jetty/api
 etc/dtd					usr/share/doc/jetty

Modified: trunk/jetty/debian/rules
===================================================================
--- trunk/jetty/debian/rules	2007-07-24 14:40:29 UTC (rev 3906)
+++ trunk/jetty/debian/rules	2007-07-24 18:53:56 UTC (rev 3907)
@@ -5,18 +5,7 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 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 \
-			   /usr/lib/j2sdk1.3 \
-			   /usr/lib/j2se/1.4 \
-			   /usr/lib/j2se/1.3
-
+JAVA_HOME		:= /usr/lib/jvm/java-gcj
 ANT_HOME		:= /usr/share/ant
-#DEB_ANT_ARGS		:= -v
-DEB_JARS		:= mx4j.jar log4j-1.2.jar /usr/share/ant/lib/ant-launcher.jar log4j.jar junit.jar
-
-#DEB_ANT_CHECK_TARGET	:= test
+DEB_JARS		:= mx4j log4j-1.2 log4j junit
 DEB_ANT_INSTALL_TARGET	:= webapps extra javadoc

Modified: trunk/jetty/debian/start.config
===================================================================
--- trunk/jetty/debian/start.config	2007-07-24 14:40:29 UTC (rev 3906)
+++ trunk/jetty/debian/start.config	2007-07-24 18:53:56 UTC (rev 3907)
@@ -42,7 +42,7 @@
 
 # Debian jars home
 java.lib.home=/usr/share/java			 always
-tomcat.lib.home=/usr/share/tomcat5/common/lib/   always
+tomcat.lib.home=/usr/share/tomcat5.5/common/lib/ always
 
 # Do not validate xml files by default.
 # Disabled because servlet-2.3.jar references an XSD which is not longer

More information about the pkg-java-commits mailing list