lsb 3.0-13 Debian release.

diff --git a/debian/changelog b/debian/changelog
index 63ed72b55c2f57c76eba8d0379c0bff228f4b0bb..8bd0bb274908c8eca56c27a8138002d9e2a4087d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+lsb (3.0-13) unstable; urgency=medium
+
+  * The "answer all the questions in the changelog" release.
+  * Skip empty headers when parsing RFC822 headers for init scripts.
+    (Closes: #343310)
+  * The versioned dependency on dpkg-dev is due to the use of
+    DEB_*_ARCH_CPU in debian/rules, which only became available in dpkg
+    1.13.2.  Feel free to submit a patch to facilitate a sarge backport.
+    (Closes: #344392)
+  * Since the lsb family of packages track an upstream specification with 
+    "non-native" version numbering, the use of a hyphenated version number
+    for these native packages is justified.  (Closes: #344384)
+    (Note that although it does violate policy for a non-native package to
+    lack a hyphen in its version number, the contrapositive case does not
+    violate policy.)
+  * Deal with missing /etc/debian_version.  (Closes: #341719)
+
+ -- Chris Lawrence <lawrencc@debian.org>  Thu, 29 Dec 2005 03:50:44 -0500
+
 lsb (3.0-12) unstable; urgency=low
 
   * Remove the pidfile in killproc().  (Closes: #321271)

diff --git a/initdutils.py b/initdutils.py
index cd373699403ad6d88e0aa42320146c727ce96121..3b5bb107e947718f645a03cd2e9789727728b31d 100644 (file)
--- a/initdutils.py
+++ b/initdutils.py
@@ -82,7 +82,7 @@ def scan_initfile(initfile):
     for header, body in inheaders.iteritems():
         # Ignore empty headers
         if not body.strip():
-            break
+            continue
         
         if header in ('Default-Start', 'Default-Stop'):
             headers[header] = map(int, body.split())

diff --git a/lsb_release b/lsb_release
index 7cf2cd96bd289ccf89ca03139497777a3c19cf30..408aa0bb08efc161b701c521931681f3483e566c 100755 (executable)
--- a/lsb_release
+++ b/lsb_release
@@ -88,6 +88,8 @@ def guess_debian_release():
     else:
         distinfo['OS'] = 'GNU'
 
+    distinfo['DESCRIPTION'] = '%(ID)s %(OS)s' % distinfo
+
     if os.path.exists('/etc/debian_version'):
         release = open('/etc/debian_version').read().strip()
         if not release[0:1].isalpha():
@@ -97,8 +99,8 @@ def guess_debian_release():
         else:
             # Guess with apt policy before being this stupid?
             distinfo.update({ 'RELEASE' : release, 'CODENAME' : 'sid'})
+        distinfo['DESCRIPTION'] += ' %(RELEASE)s (%(CODENAME)s)' % distinfo
 
-    distinfo['DESCRIPTION'] = '%(ID)s %(OS)s %(RELEASE)s (%(CODENAME)s)' % distinfo
     return distinfo
 
 def get_distro_information():