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

[Niels Thykier]

Author: nthykier-guest
Date: 2009-10-23 15:27:52 +0000 (Fri, 23 Oct 2009)
New Revision: 10863

Modified:
   trunk/jetty/debian/changelog
   trunk/jetty/debian/control
   trunk/jetty/debian/jetty.init
   trunk/jetty/debian/jetty.links
Log:
Updated init to avoid rm -fr /tmp in postrm.

Modified: trunk/jetty/debian/changelog
===================================================================
--- trunk/jetty/debian/changelog	2009-10-23 15:20:41 UTC (rev 10862)
+++ trunk/jetty/debian/changelog	2009-10-23 15:27:52 UTC (rev 10863)
@@ -1,7 +1,14 @@
-jetty (6.1.21-1) UNRELEASED; urgency=low
+jetty (6.1.21-1) UNRELEASED; urgency=medium
 
   * New upstream release.
-  * Stopped removing files in /tmp/ during postrm for security reasons.
+  * Stopped using /tmp/jetty-temp in /etc/init.d/jetty for security
+    reasons.
+    - JVM_TMP is now /var/cache/jetty/tmp
+    - JETTY_TMP is now /var/cache/jetty/data
+  * The postrm script no longer deletes files in /tmp/jetty-temp.
+  * Removed Philipp Meier from Uploaders (last upload was 2006-06-07).
+    Thanks for your work on this package.
+  * Corrected javadoc symlink in binary package jetty.
 
  -- Niels Thykier <niels at thykier.net>  Fri, 09 Oct 2009 13:25:54 +0200
 

Modified: trunk/jetty/debian/control
===================================================================
--- trunk/jetty/debian/control	2009-10-23 15:20:41 UTC (rev 10862)
+++ trunk/jetty/debian/control	2009-10-23 15:27:52 UTC (rev 10863)
@@ -2,7 +2,7 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Philipp Meier <meier at fnogol.de>, Michael Koch <konqueror at gmx.de>, Thierry Carrez <thierry.carrez at ubuntu.com>,
+Uploaders: Michael Koch <konqueror at gmx.de>, Thierry Carrez <thierry.carrez at ubuntu.com>,
  Ludovic Claude <ludovic.claude at laposte.net>, Torsten Werner <twerner at debian.org>,
  Niels Thykier <niels at thykier.net>
 Build-Depends: debhelper (>= 6), cdbs (>> 0.4.5.3), openjdk-6-jdk, ant, maven-repo-helper,

Modified: trunk/jetty/debian/jetty.init
===================================================================
--- trunk/jetty/debian/jetty.init	2009-10-23 15:20:41 UTC (rev 10862)
+++ trunk/jetty/debian/jetty.init	2009-10-23 15:27:52 UTC (rev 10863)
@@ -74,7 +74,7 @@
 START_DAEMON_JAR="$JETTY_HOME/start-daemon.jar"
 DEFAULT=/etc/default/$NAME
 DAEMON=/usr/bin/jsvc
-JVM_TMP=/tmp/jetty-temp
+JVM_TMP=/var/cache/jetty/
 
 if [ `id -u` -ne 0 ]; then
 	echo "You need root privileges to run this script"
@@ -140,7 +140,7 @@
 JETTY_SHUTDOWN=30
 
 # Jetty uses a directory to store temporary files like unpacked webapps
-JETTY_TMP=/var/cache/jetty
+JETTY_TMP=/var/cache/jetty/data
 
 # Jetty uses a config file to setup its boot classpath
 JETTY_START_CONFIG=/etc/jetty/start.config

Modified: trunk/jetty/debian/jetty.links
===================================================================
--- trunk/jetty/debian/jetty.links	2009-10-23 15:20:41 UTC (rev 10862)
+++ trunk/jetty/debian/jetty.links	2009-10-23 15:27:52 UTC (rev 10863)
@@ -2,5 +2,5 @@
 var/log/jetty          usr/share/jetty/logs
 etc/jetty              usr/share/jetty/etc
 etc/jetty/contexts     usr/share/jetty/contexts
-usr/share/doc/libjetty-java-doc/api usr/share/jetty/javadoc
+usr/share/doc/libjetty-java/api usr/share/jetty/javadoc