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

[Torsten Werner]

Author: twerner
Date: 2009-07-14 09:54:22 +0000 (Tue, 14 Jul 2009)
New Revision: 9279

Modified:
   trunk/jetty/debian/changelog
   trunk/jetty/debian/control
   trunk/jetty/debian/jetty.init
Log:
* Add myself to Uploaders.
* Update Standards-Version: 3.8.2.
* Move package libjetty-java-doc to Section: doc.
* Fix init script: check for /etc/default/rcS before reading it.

Modified: trunk/jetty/debian/changelog
===================================================================
--- trunk/jetty/debian/changelog	2009-07-14 09:43:29 UTC (rev 9278)
+++ trunk/jetty/debian/changelog	2009-07-14 09:54:22 UTC (rev 9279)
@@ -1,5 +1,6 @@
 jetty (6.1.19-1) experimental; urgency=low
 
+  [ Ludovic Claude ]
   * New upstream release fixing a security vulnerability
     (cookies are not secure if you are running behind a netscaler)
   * Remove the bootstrap patch as it has been added upstream and update
@@ -18,8 +19,14 @@
   * Update debian/copyright (patch provided by Jan Pascal Vanbest 
     <janpascal at vanbest.org>)
 
- -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 13 Jul 2009 13:21:54 +0100
+  [ Torsten Werner ]
+  * Add myself to Uploaders.
+  * Update Standards-Version: 3.8.2.
+  * Move package libjetty-java-doc to Section: doc.
+  * Fix init script: check for /etc/default/rcS before reading it.
 
+ -- Torsten Werner <twerner at debian.org>  Tue, 14 Jul 2009 11:50:43 +0200
+
 jetty (6.1.18-1) unstable; urgency=low
 
   [Ludovic Claude]

Modified: trunk/jetty/debian/control
===================================================================
--- trunk/jetty/debian/control	2009-07-14 09:43:29 UTC (rev 9278)
+++ trunk/jetty/debian/control	2009-07-14 09:54:22 UTC (rev 9279)
@@ -3,11 +3,11 @@
 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>,
- Ludovic Claude <ludovic.claude at laposte.net>
+ Ludovic Claude <ludovic.claude at laposte.net>, Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 6), cdbs (>> 0.4.5.3), openjdk-6-jdk, ant, maven-repo-helper
 Build-Depends-Indep: libservlet2.5-java, libslf4j-java, libmx4j-java, libgnumail-java,
  libgnujaf-java, libcommons-daemon-java
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jetty
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jetty
 Homepage: http://jetty.mortbay.com/
@@ -23,6 +23,7 @@
  dynamic HTTP requests from any Java application.
 
 Package: libjetty-java-doc
+Section: doc
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: jetty

Modified: trunk/jetty/debian/jetty.init
===================================================================
--- trunk/jetty/debian/jetty.init	2009-07-14 09:43:29 UTC (rev 9278)
+++ trunk/jetty/debian/jetty.init	2009-07-14 09:54:22 UTC (rev 9279)
@@ -88,9 +88,12 @@
 fi
 
 . /lib/lsb/init-functions
-. /etc/default/rcS
 
+if [ -r /etc/default/rcS ]; then
+	. /etc/default/rcS
+fi
 
+
 # The following variables can be overwritten in /etc/default/jetty
 
 # Whether to start jetty (as a daemon) or not