lsb 3.0-11 Debian release.

diff --git a/debian/changelog b/debian/changelog
index a53d915a64267bcb3a851f49cd9048155625a207..4e13aa910c8b2c98e079dcc2790b979dab9ae89c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lsb (3.0-11) unstable; urgency=low
+
+  * Use the basename in killproc when calling start-stop-daemon.
+    (Closes: #332744)
+  * lsb-base conflicts/replaces lsb-core (<< 2.0-6).  (Closes: #335798)
+
+ -- Chris Lawrence <lawrencc@debian.org>  Thu, 27 Oct 2005 05:29:07 -0400
+
 lsb (3.0-10) unstable; urgency=low
 
   * Use --name instead of --exec in killproc().  (Closes: #332744)

diff --git a/debian/control b/debian/control
index cb5907d693c218bea7fb77741067df352c641a80..c8f2e5e1a1956553d2443fd7d3b79cf20778011a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -94,8 +94,8 @@ Description: Linux Standard Base 3.0 support package
 Package: lsb-base
 Architecture: all
 Depends: sed, ncurses-bin
-Replaces: lsb (<< 2.0-6)
-Conflicts: lsb (<< 2.0-6)
+Replaces: lsb-core (<< 2.0-6), lsb (<< 2.0-6)
+Conflicts: lsb-core (<< 2.0-6), lsb (<< 2.0-6)
 Priority: required
 Description: Linux Standard Base 3.0 init script functionality
  The Linux Standard Base (http://www.linuxbase.org/) is a standard

diff --git a/init-functions b/init-functions
index 35bcd551a9a9abb078614496d725a35df3f33cde..22b41adb2b09bc74d42d7e5d34f82e8f8016c911 100644 (file)
--- a/init-functions
+++ b/init-functions
@@ -94,7 +94,7 @@ pidofproc () {
 
 # start-stop-daemon uses the same algorithm as "pidofproc" above.
 killproc () {
-    local pidfile sig status
+    local pidfile sig status base
     set -- `POSIXLY_CORRECT=1 getopt "p:" $*`
     pidfile=
 
@@ -105,19 +105,20 @@ killproc () {
         esac
     done
 
+    base=$(basename "$1")
     if [ ! $pidfile ]; then
-        pidfile=/var/run/$(basename "$1").pid
+        pidfile=/var/run/$base.pid
     fi
 
     if [ $2 ]; then
         sig=$(echo $2 | sed -e 's/^-\(.*\)/\1/')
         sig=$(echo $sig | sed -e 's/^SIG\(.*\)/\1/')
-        /sbin/start-stop-daemon --stop --pidfile "$pidfile" --signal $sig --quiet --name "$1"
+        /sbin/start-stop-daemon --stop --pidfile "$pidfile" --signal $sig --quiet --name "$base"
         status="$?"
         [ "$status" = 1 ] && return 3 # program is not running
         return 0
     else
-        /sbin/start-stop-daemon --stop --pidfile "$pidfile" --retry 5 --quiet --oknodo --name "$1"
+        /sbin/start-stop-daemon --stop --pidfile "$pidfile" --retry 5 --quiet --oknodo --name "$base"
     fi
 }