From b0e2174ae98fd1f408ac27a550d6356639f9aa2a Mon Sep 17 00:00:00 2001 From: Chris Lawrence Date: Thu, 29 Dec 2005 03:50:44 -0500 Subject: [PATCH] lsb 3.0-13 Debian release. --- debian/changelog | 19 +++++++++++++++++++ initdutils.py | 2 +- lsb_release | 4 +++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 63ed72b..8bd0bb2 100644 --- 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 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 cd37369..3b5bb10 100644 --- 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 7cf2cd9..408aa0b 100755 --- 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(): -- 2.30.2