r2146 - trunk/jetty/debian

[Philipp Meier]

Author: llucifer-guest
Date: 2006-05-29 10:54:16 +0000 (Mon, 29 May 2006)
New Revision: 2146

Modified:
   trunk/jetty/debian/changelog
   trunk/jetty/debian/control
   trunk/jetty/debian/jetty.init
   trunk/jetty/debian/jetty.postinst
Log:
* Bump Standards-Version to 3.7.2 (no changes)
* Fix Build-Dependencies: cdbs to Build-Depends



Modified: trunk/jetty/debian/changelog
===================================================================
--- trunk/jetty/debian/changelog	2006-05-28 09:30:45 UTC (rev 2145)
+++ trunk/jetty/debian/changelog	2006-05-29 10:54:16 UTC (rev 2146)
@@ -8,8 +8,10 @@
   * Remove null dispatch attributes from getAttributeNames
   * Put POST content default back to iso_8859_1. GET is UTF-8
     still
+  * Fix in init script for new version of su (closes #367491).
+  * Create logfile if not existing (closes #356066).
 
- -- Philipp Meier <meier at fnogol.de>  Mon,  9 Jan 2006 13:40:36 +0100
+ -- Philipp Meier <meier at fnogol.de>  Mon, 29 May 2006 12:39:13 +0200
 
 jetty (5.1.8-3) unstable; urgency=low
 

Modified: trunk/jetty/debian/control
===================================================================
--- trunk/jetty/debian/control	2006-05-28 09:30:45 UTC (rev 2145)
+++ trunk/jetty/debian/control	2006-05-29 10:54:16 UTC (rev 2146)
@@ -3,12 +3,13 @@
 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, cdbs ( >>0.4.5.3)
-Standards-Version: 3.6.2
+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)
+Standards-Version: 3.7.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 | kaffe (>= 2:1.1.5-5), jikes | j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | java2-compiler | kaffe (>= 2:1.1.5-5), libxerces2-java, libtomcat5-java, libmx4j-java, adduser, libservlet2.4-java, libcommons-logging-java, ant, apache2-utils
+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
 Description: Java servlet engine and webserver
  Jetty is an Open Source HTTP Servlet Server written in 100% Java.

Modified: trunk/jetty/debian/jetty.init
===================================================================
--- trunk/jetty/debian/jetty.init	2006-05-28 09:30:45 UTC (rev 2145)
+++ trunk/jetty/debian/jetty.init	2006-05-29 10:54:16 UTC (rev 2146)
@@ -110,11 +110,15 @@
 	    fi
 
 	    echo -n "Starting $DESC: "
+	    	if [ \! -e "$LOGDIR/out.log" ]; then
+			touch "$LOGDIR/out.log"
+			chown jetty.adm "$LOGDIR/out.log"
+		fi
 		su -p -s /bin/sh "$JETTY_USER" \
 			-c "$ROTATELOGS \"$LOGDIR/out.log\" 86400" \
 			< "$LOGDIR/out.log" &
-		su -p -s /bin/sh - "$JETTY_USER" \
-			"$JAVA $ARGUMENTS >> $LOGDIR/out.log 2>&1 & \
+		su -p -s /bin/sh "$JETTY_USER" \
+			-c "$JAVA $ARGUMENTS >> $LOGDIR/out.log 2>&1 & \
 			    echo \$!"  > "$PIDFILE"
                 echo "$NAME."
 	else

Modified: trunk/jetty/debian/jetty.postinst
===================================================================
--- trunk/jetty/debian/jetty.postinst	2006-05-28 09:30:45 UTC (rev 2145)
+++ trunk/jetty/debian/jetty.postinst	2006-05-29 10:54:16 UTC (rev 2146)
@@ -7,7 +7,7 @@
 		--ingroup nogroup --disabled-password --shell /bin/false \
 		jetty
 	fi
-	chown jetty.adm /var/cache/jetty /var/log/jetty 
+	chown jetty:adm /var/cache/jetty /var/log/jetty 
 	chmod 750 /var/log/jetty 
     ;;