lsb 3.1-8 Debian release.

diff --git a/debian/changelog b/debian/changelog
index a3c112c359cfac0e73e3a7dd14b2ff99aea91696..553951571da5651cd4e80414e2f3c8612384c40f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+lsb (3.1-8) unstable; urgency=low
+
+  * Fix killproc() to work if signal isn't specified; also fix the
+    pidfile check in both killproc() and pidofproc().  (Closes: #370075)
+
+ -- Chris Lawrence <lawrencc@debian.org>  Sat,  3 Jun 2006 02:45:55 -0400
+
+lsb (3.1-7) unstable; urgency=low
+
+  * lsb-graphics: Depend on libx11-6 | xlibs.  (Closes: #369955)
+
+ -- Chris Lawrence <lawrencc@debian.org>  Fri,  2 Jun 2006 15:47:52 -0400
+
 lsb (3.1-6) unstable; urgency=low
 
   * Replace uses of $n with ${n:-} where $n could be unbound.

diff --git a/debian/control b/debian/control
index b0e51e3eb80410ab3936e62577923659e129055a..ac8017c676a0fcd87a054ba3a8caf94074f0f404 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Description: Linux Standard Base 3.1 core support package
 
 Package: lsb-graphics
 Architecture: any
-Depends: lsb-core, xlibmesa3-gl | libgl1, xlibs, ${misc:Depends}
+Depends: lsb-core, xlibmesa3-gl | libgl1, libx11-6 | xlibs, ${misc:Depends}
 Conflicts: libutahglx1
 Provides: lsb-graphics-noarch, ${provides}
 Description: Linux Standard Base 3.1 graphics support package

diff --git a/init-functions b/init-functions
index 6b7a1efefe7b03e31f39e2cf7a42fe28c5b7e14e..5a925f02aec6f344bd1493058c314481e8fec000 100644 (file)
--- a/init-functions
+++ b/init-functions
@@ -58,7 +58,7 @@ pidofproc () {
     local pidfile line i pids= status specified pid
     set -- `POSIXLY_CORRECT=1 getopt "p:" $*`
     pidfile=
-    specified=0
+    specified=
 
     for i in $*; do
         case $i in
@@ -94,7 +94,7 @@ killproc () {
     local pidfile sig status base i specified
     set -- `POSIXLY_CORRECT=1 getopt "p:" $*`
     pidfile=
-    specified=0
+    specified=
 
     for i in $*; do
         case $i in
@@ -109,8 +109,9 @@ killproc () {
     fi
 
     if [ $specified ]; then
-        sig=$(echo $2 | sed -e 's/^-\(.*\)/\1/')
+        sig=$(echo ${2:-} | sed -e 's/^-\(.*\)/\1/')
         sig=$(echo $sig | sed -e 's/^SIG\(.*\)/\1/')
+        sig=${sig:-TERM}
         /sbin/start-stop-daemon --stop --pidfile "$pidfile" --signal $sig --quiet --name "$base"
         status="$?"
         [ "$status" = 1 ] && return 3 # program is not running