From b7426a05b4a11088b95e0f0ed659e54caec44ec0 Mon Sep 17 00:00:00 2001
From: Chris Lawrence <lawrencc@debian.org>
Date: Wed, 15 Nov 2006 18:09:02 -0600
Subject: [PATCH] lsb 3.1-20 Debian release.

---
 debian/changelog | 12 ++++++++++++
 init-functions   |  8 +++++---
 lsb_release      | 29 ++++++++++++++---------------
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e5aef4c..6ee659d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+lsb (3.1-20) unstable; urgency=low
+
+  * The "hopefully we can push this into testing now that the bugs are all
+    shaken out, maybe" release.
+  * Don't use --name in killproc() when a pidfile is provided; thanks to
+    Timo Reimann for the patch.  (Closes: #397977)
+  * Give lsb_release's heuristics priority over whatever is in
+    /etc/debian_version; note that /etc/lsb-release will override both and
+    should be supplied by derived distributions.  (Closes: #396853)
+
+ -- Chris Lawrence <lawrencc@debian.org>  Wed, 15 Nov 2006 18:09:02 -0600
+
 lsb (3.1-19) unstable; urgency=low
 
   * Now try the eval hack in start-stop-daemon, since nothing else seems
diff --git a/init-functions b/init-functions
index 89de309..2eea946 100644
--- a/init-functions
+++ b/init-functions
@@ -95,8 +95,9 @@ pidofproc () {
 
 # start-stop-daemon uses the same algorithm as "pidofproc" above.
 killproc () {
-    local pidfile sig status base i
+    local pidfile sig status base i name_param
     pidfile=
+    name_param=
 
     OPTIND=1
     while getopts p: opt ; do
@@ -109,14 +110,15 @@ killproc () {
     base=${1##*/}
     if [ ! $pidfile ]; then
         pidfile=/var/run/$base.pid
+        name_param="--name $base"
     fi
 
     sig=$(echo ${2:-} | sed -e 's/^-\(.*\)/\1/')
     sig=$(echo $sig | sed -e 's/^SIG\(.*\)/\1/')
     if [ -n "$sig" ]; then
-        /sbin/start-stop-daemon --stop --pidfile "$pidfile" --signal "$sig" --quiet --name "$base"
+        /sbin/start-stop-daemon --stop --pidfile "$pidfile" --signal "$sig" --quiet $name_param
     else
-        /sbin/start-stop-daemon --stop --pidfile "$pidfile" --retry 5 --quiet --oknodo --name "$base"
+        /sbin/start-stop-daemon --stop --pidfile "$pidfile" --retry 5 --quiet --oknodo $name_param
     fi
     status="$?"
     if [ "$status" = 1 ]; then
diff --git a/lsb_release b/lsb_release
index 3ba30ab..ff75a6a 100755
--- a/lsb_release
+++ b/lsb_release
@@ -33,7 +33,7 @@ RELEASE_CODENAME_LOOKUP = {
     '2.2' : 'potato',
     '3.0' : 'woody',
     '3.1' : 'sarge',
-    '4.0' : 'etch', # XXX - may not end up as 3.2
+    '4.0' : 'etch',
     }
 
 TESTING_CODENAME = 'etch'
@@ -132,28 +132,27 @@ def guess_debian_release():
 
     distinfo['DESCRIPTION'] = '%(ID)s %(OS)s' % distinfo
 
-    if os.path.exists('/etc/debian_version'):
+    release = guess_release_from_apt()
+    if release:
+        codename = RELEASE_CODENAME_LOOKUP.get(release)
+        if not codename:
+            if release == 'testing':
+                codename = TESTING_CODENAME
+            else:
+                codename = 'sid'
+        distinfo.update({ 'RELEASE' : release, 'CODENAME' : codename })
+    elif os.path.exists('/etc/debian_version'):
         release = open('/etc/debian_version').read().strip()
         if not release[0:1].isalpha():
             # /etc/debian_version should be numeric
             codename = RELEASE_CODENAME_LOOKUP.get(release, 'n/a')
             distinfo.update({ 'RELEASE' : release, 'CODENAME' : codename })
-        else:
-            release = guess_release_from_apt()
-            if release:
-                codename = RELEASE_CODENAME_LOOKUP.get(release)
-                if not codename:
-                    if release == 'testing':
-                        codename = TESTING_CODENAME
-                    else:
-                        codename = 'sid'
-                distinfo.update({ 'RELEASE' : release, 'CODENAME' : codename})
-            else:
-                distinfo.update({ 'RELEASE' : release, 'CODENAME' : 'sid'})
-        distinfo['DESCRIPTION'] += ' %(RELEASE)s (%(CODENAME)s)' % distinfo
+
+    distinfo['DESCRIPTION'] += ' %(RELEASE)s (%(CODENAME)s)' % distinfo
 
     return distinfo
 
+# Whatever is guessed above can be overridden in /etc/lsb-release
 def get_lsb_information():
     distinfo = {}
     if os.path.exists('/etc/lsb-release'):
-- 
2.30.2