From ed4669af6587ebb6c11266a7a3235a89ab4f556a Mon Sep 17 00:00:00 2001
From: Chris Lawrence <lawrencc@debian.org>
Date: Fri, 27 Oct 2006 01:18:56 -0500
Subject: [PATCH] lsb 3.1-18 Debian release.

---
 debian/changelog | 11 +++++++++++
 init-functions   | 16 +++++++---------
 lsb_release      |  2 +-
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a6ba9d5..6509782 100644
--- 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 65c6722..8bc1783 100644
--- 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 016b407..3ba30ab 100755
--- 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'
-- 
2.30.2