[pkg-java] r9370 - trunk/tomcat6/debian

[Torsten Werner]

Author: twerner
Date: 2009-07-16 21:42:08 +0000 (Thu, 16 Jul 2009)
New Revision: 9370

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/control
   trunk/tomcat6/debian/tomcat6.init
Log:
* Fix init script:
  - Change Provides: tomcat6. (Closes: #532286)
  - Check for /etc/default/rcS before sourcing it.
* Update Standards-Version: 3.8.2 (no changes).

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2009-07-16 19:10:54 UTC (rev 9369)
+++ trunk/tomcat6/debian/changelog	2009-07-16 21:42:08 UTC (rev 9370)
@@ -1,3 +1,12 @@
+tomcat6 (6.0.20-4) experimental; urgency=low
+
+  * Fix init script:
+    - Change Provides: tomcat6. (Closes: #532286)
+    - Check for /etc/default/rcS before sourcing it.
+  * Update Standards-Version: 3.8.2 (no changes).
+
+ -- Torsten Werner <twerner at debian.org>  Thu, 16 Jul 2009 23:36:32 +0200
+
 tomcat6 (6.0.20-3) experimental; urgency=low
 
   * Add the Maven POM to the package

Modified: trunk/tomcat6/debian/control
===================================================================
--- trunk/tomcat6/debian/control	2009-07-16 19:10:54 UTC (rev 9369)
+++ trunk/tomcat6/debian/control	2009-07-16 21:42:08 UTC (rev 9370)
@@ -6,7 +6,7 @@
  Torsten Werner <twerner at debian.org>
 Build-Depends: openjdk-6-jdk, ant-optional, debhelper (>= 6), quilt
 Build-Depends-Indep: maven-repo-helper, libecj-java
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Homepage: http://tomcat.apache.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/tomcat6
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/tomcat6

Modified: trunk/tomcat6/debian/tomcat6.init
===================================================================
--- trunk/tomcat6/debian/tomcat6.init	2009-07-16 19:10:54 UTC (rev 9369)
+++ trunk/tomcat6/debian/tomcat6.init	2009-07-16 21:42:08 UTC (rev 9370)
@@ -8,7 +8,7 @@
 # Modified for Tomcat6 by Thierry Carrez <thierry.carrez at ubuntu.com>.
 #
 ### BEGIN INIT INFO
-# Provides:          tomcat
+# Provides:          tomcat6
 # Required-Start:    $local_fs $remote_fs $network
 # Required-Stop:     $local_fs $remote_fs $network
 # Should-Start:      $named
@@ -41,9 +41,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 $DEFAULT
 
 # Run Tomcat 6 as this user ID