lsb 3.1-18 Debian release.

diff --git a/debian/changelog b/debian/changelog
index a6ba9d5d27682b1f33ea6250e2a214c21c5c2daa..65097823fd375991ba8e8dd2374a395f773bdb3e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+lsb (3.1-18) unstable; urgency=low
+
+  * etch will be Debian 4.0, not Debian 3.2.  (Closes: #395004)
+  * Don't quote $@ in start-stop-daemon calls, which should resolve issues
+    with multiple/quoted arguments to the daemon in start_daemon().
+    (Closes: #388836)
+  * Revert to testing for a fancy TTY before trying to call tput and friends,
+    to avoid crap spewage on shutdown.  (Closes: #390363, #391981)
+
+ -- Chris Lawrence <lawrencc@debian.org>  Fri, 27 Oct 2006 01:18:56 -0500
+
 lsb (3.1-17) unstable; urgency=low
 
   * Set FANCYTTY to a null string to cope with init scripts that for some

diff --git a/init-functions b/init-functions
index 65c6722883fd48ea1d880d6e0df5f79dd5280764..8bc1783adcf769fd3fd989f87265c6c99b379ba5 100644 (file)
--- a/init-functions
+++ b/init-functions
@@ -48,11 +48,11 @@ start_daemon () {
     exec="$1"; shift
 
     if [ $force = 1 ]; then
-        /sbin/start-stop-daemon --start --nicelevel $nice --quiet --startas $exec --pidfile /dev/null --oknodo -- "$@"
+        /sbin/start-stop-daemon --start --nicelevel $nice --quiet --startas $exec --pidfile /dev/null --oknodo -- $@
     elif [ $pidfile ]; then
-        /sbin/start-stop-daemon --start --nicelevel $nice --quiet --exec $exec --oknodo --pidfile "$pidfile" -- "$@"
+        /sbin/start-stop-daemon --start --nicelevel $nice --quiet --exec $exec --oknodo --pidfile "$pidfile" -- $@
     else
-        /sbin/start-stop-daemon --start --nicelevel $nice --quiet --exec $exec --oknodo -- "$@"
+        /sbin/start-stop-daemon --start --nicelevel $nice --quiet --exec $exec --oknodo -- $@
     fi
 }
 
@@ -131,12 +131,10 @@ killproc () {
 log_use_fancy_output () {
     TPUT=/usr/bin/tput
     EXPR=/usr/bin/expr
-    if [ -z $FANCYTTY ]; then
-        if [ "x$TERM" != "xdumb" ] && [ -x $TPUT ] && [ -x $EXPR ] && $TPUT hpa 60 >/dev/null 2>&1 && $TPUT setaf 1 >/dev/null 2>&1; then
-            FANCYTTY=1
-        else
-            FANCYTTY=0
-        fi
+    if [ "x$TERM" != "xdumb" ] && [ -x $TPUT ] && [ -x $EXPR ] && $TPUT hpa 60 >/dev/null 2>&1 && $TPUT setaf 1 >/dev/null 2>&1; then
+        [ -z $FANCYTTY ] && FANCYTTY=1
+    else
+        FANCYTTY=0
     fi
     case "$FANCYTTY" in
         1|Y|yes|true)   true;;

diff --git a/lsb_release b/lsb_release
index 016b4076d248d67ee844e76de4404f8e941e7fb2..3ba30ab2e218cef697c514e22c8732aee88bc79e 100755 (executable)
--- a/lsb_release
+++ b/lsb_release
@@ -33,7 +33,7 @@ RELEASE_CODENAME_LOOKUP = {
     '2.2' : 'potato',
     '3.0' : 'woody',
     '3.1' : 'sarge',
-    '3.2' : 'etch', # XXX - may not end up as 3.2
+    '4.0' : 'etch', # XXX - may not end up as 3.2
     }
 
 TESTING_CODENAME = 'etch'