From 48b51460a7c89e08661b04cb87d8f63ac73552f9 Mon Sep 17 00:00:00 2001 From: Chris Lawrence Date: Sat, 18 Sep 2010 17:08:17 -0500 Subject: [PATCH] lsb 3.2-24 Debian release. --- debian/changelog | 17 +++++++++++ debian/control | 4 +-- debian/lsb-base.README.Debian | 4 +-- debian/po/pt_BR.po | 55 +++++++++++++++-------------------- debian/postinst | 2 +- init-functions | 2 +- lsb_release | 2 +- lsb_release.1 | 4 ++- lsb_release.py | 15 ++++++++-- 9 files changed, 63 insertions(+), 42 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7e47734..224e223 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +lsb (3.2-24) unstable; urgency=low + + * Improve detection of Debian version when there is a "tie" in + APT's sources.list. Patch by Giovanni Mascellani. (Closes: #540208) + * Fix test for PID file in init-functions. Patch by Keith O'Brien. + (Closes: #545896) + * Fix reporting for more recent versions of Debian GNU/kFreeBSD. Patch + by Gonéri Le Bouder. (Closes: #595159) + * Use --print-architecture instead of --print-installation-architecture + in lsb-core postinst. (Closes: #542610) + * Fix formatting error in lsb_release(1). Patch by Adam Guthrie. + (Closes: #586575) + * Update pt_BR translation for debconf messages, thanks to Flamarion Jorge. + (Closes: #596438) + + -- Chris Lawrence Sat, 18 Sep 2010 17:08:17 -0500 + lsb (3.2-23.1) unstable; urgency=low * Non-maintainer upload. diff --git a/debian/control b/debian/control index 617f514..b7c68fe 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,13 @@ Section: misc Priority: extra Maintainer: Chris Lawrence Build-Depends: debhelper (>> 7), po-debconf (>= 0.5.0), dpkg-dev (>= 1.10), python-support, python-all-dev -Standards-Version: 3.8.2 +Standards-Version: 3.9.1 XS-Python-Version: all Homepage: http://www.linux-foundation.org/en/LSB Package: lsb-core Architecture: any -Depends: lsb-release, ${glibc}, libz1, libncurses5, libpam0g, exim4 | mail-transport-agent, at, bc, binutils, bsdmainutils, bsdutils, cpio, cron, ed, file, libc6-dev | libc-dev, locales, cups-bsd | lpr, lprng | cups-client, m4, mailx | mailutils, make, man-db, mawk | gawk, ncurses-term, passwd, patch, pax, procps, psmisc, rsync, alien (>= 8.36), ${python:Depends}, ${misc:Depends}, ${depends}, lsb-base, time +Depends: lsb-release, ${glibc}, libz1, libncurses5, libpam0g, exim4 | mail-transport-agent, at, bc, binutils, bsdmainutils, bsdutils, cpio, cron, ed, file, libc6-dev | libc-dev, locales, cups-bsd | lpr, lprng | cups-client, m4, mailutils | mailx, make, man-db, mawk | gawk, ncurses-term, passwd, patch, pax, procps, psmisc, rsync, alien (>= 8.36), ${python:Depends}, ${misc:Depends}, ${depends}, lsb-base, time Provides: lsb-core-noarch, ${provides} Conflicts: lsb (<< 2.0-2) Replaces: lsb (<< 2.0-2) diff --git a/debian/lsb-base.README.Debian b/debian/lsb-base.README.Debian index d39610d..49f256b 100644 --- a/debian/lsb-base.README.Debian +++ b/debian/lsb-base.README.Debian @@ -128,7 +128,7 @@ If supplied, this script fragment should be compatible with any Debian /bin/sh, as init scripts sourcing this file may be running under any Bourne-style shell permitted by Debian policy (i.e. not just bash). -"Fancy output" can be overriden by setting FANCYTTY=0 in this file. +"Fancy output" can be overridden by setting FANCYTTY=0 in this file. From lsb-base 3.2-14, you can use the following hook functions which are called by the appropriate functions, instead of supplying your own @@ -145,4 +145,4 @@ Each function receives all of the arguments sent to the parent function; the "pre" functions operate before any output, while the "post" functions operate after the output is produced. - -- Chris Lawrence , Mon, 14 Jul 2008 11:34:48 -0500 + -- Chris Lawrence , Sat, 18 Sep 2010 17:09:57 -0500 diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 4007705..e88fcca 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -1,40 +1,34 @@ +# Debconf translations for lsb. +# Copyright (C) 2010 THE lsb'S COPYRIGHT HOLDER +# This file is distributed under the same license as the lsb package. # -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. +# Flamarion Jorge , 2010. # msgid "" msgstr "" -"Project-Id-Version: lsb_1.2-6\n" +"Project-Id-Version: lsb 3.2_23-1\n" "Report-Msgid-Bugs-To: lawrencc@debian.org\n" "POT-Creation-Date: 2007-05-13 09:16+0200\n" -"PO-Revision-Date: 2003-03-30 12:49-0300\n" -"Last-Translator: André Luís Lopes \n" -"Language-Team: Debian-BR Project \n" +"PO-Revision-Date: 2010-09-04 14:29-0300\n" +"Last-Translator: Flamarion Jorge \n" +"Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"pt_BR utf-8\n" #. Type: boolean #. Description #: ../templates:2001 -#, fuzzy #| msgid "Should shadow passwords be enabled?" msgid "Enable shadow passwords?" -msgstr "O suporte a senhas shadow deve ser habilitado ?" +msgstr "Habilitar senhas \"shadow\"?" #. Type: boolean #. Description #: ../templates:2001 -#, fuzzy #| msgid "" #| "The Linux Standard Base requires that certain features of adduser(8) be " #| "available to conforming applications (such as password aging). Debian " @@ -46,16 +40,14 @@ msgid "" "features are only provided when shadow passwords are enabled, while this " "system has them disabled." msgstr "" -"A Linux Standard Base requer que certos recursos do adduser(8) estejam " -"disponíveis para aplicações conformantes (como expiração de senhas). O " -"Debian somente oferecerá tais recursos quando senhas shadow estiverem " -"habilitadas. Porém, seu sistema atualmente não possui senhas shadow " -"habilitadas." +"A Linux Standard Base requer que certas funcionalidades do adduser(8) " +"estejam disponíveis para aplicações em conformidade (como expiração de " +"senhas). Estas funcionalidades somente são fornecidas quando senhas " +"\"shadow\" estão habilitadas, e neste sistema estão desabilitadas." #. Type: boolean #. Description #: ../templates:2001 -#, fuzzy #| msgid "" #| "Most LSB applications will work fine with either setting, but 100% " #| "conformance requires shadow passwords to be enabled." @@ -63,14 +55,13 @@ msgid "" "Most LSB applications will work fine with either setting, but complete " "conformance requires shadow passwords to be enabled." msgstr "" -"A maioria das aplicações LSB funcionarão com qualquer uma das configurações, " -"mas 100% de compatibilidade requer que o suporte a senhas shadow esteja " -"habilitado." +"A maioria das aplicações LSB funcionarão bem com qualquer uma das " +"configurações, mas a conformidade completa requer que senhas \"shadow\" " +"estejam habilitadas." #. Type: boolean #. Description #: ../templates:2001 -#, fuzzy #| msgid "" #| "Generally speaking, it is considered good practice to enable shadow " #| "passwords. However, there are some situations in which shadow passwords " @@ -82,10 +73,10 @@ msgid "" "not work properly (most notably, if non-root users need to check passwords " "against /etc/passwd)." msgstr "" -"De modo geral, é considerado uma boa prática habilitar senhas shadow. Porém, " -"existem algumas situações nas quais senhas shadow podem não funcionar de " -"maneira correta (mais notavelmente, caso usuários não-root precisem se " -"autenticar no /etc/passwd)." +"Genericamente falando, é considerado boa prática habilitar senhas \"shadow\". " +"No entanto, existem algumas situações nas quais senhas \"shadow\" podem não " +"funcionar corretamente (notavelmente se usuários não-root precisam verificar " +"senhas no /etc/passwd)." #~ msgid "" #~ "If you answer in the affirmative, the command 'shadowconfig on' will be " diff --git a/debian/postinst b/debian/postinst index a75344b..3652152 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,7 +1,7 @@ #!/bin/sh -e setup_ldso_symlink () { - ARCH=`dpkg --print-installation-architecture` + ARCH=`dpkg --print-architecture` case "$ARCH" in s390|ppc64|sparc|sparc64|alpha|hppa|m68k|mipsel) ln -sf ld.so.1 /lib/ld-lsb-$ARCH.so.1 diff --git a/init-functions b/init-functions index 0514b0f..67f2fb0 100644 --- a/init-functions +++ b/init-functions @@ -91,7 +91,7 @@ pidofproc () { fi fi fi - if [ -x /bin/pidof -a ! "$specified" ]; then + if [ -x /bin/pidof -a "$specified" ]; then status="0" /bin/pidof -o %PPID -x $1 || status="$?" if [ "$status" = 1 ]; then diff --git a/lsb_release b/lsb_release index 0bec11c..8988429 100755 --- a/lsb_release +++ b/lsb_release @@ -1,7 +1,7 @@ #!/usr/bin/python # lsb_release command for Debian -# (C) 2005-08 Chris Lawrence +# (C) 2005-10 Chris Lawrence # This package is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lsb_release.1 b/lsb_release.1 index 70dc43d..b75ecb5 100644 --- a/lsb_release.1 +++ b/lsb_release.1 @@ -51,7 +51,9 @@ responsibility of the author below. Detection of systems using a mix of packages from various distributions or releases is something of a black art; the current heuristic tends to assume that the installation is of the earliest distribution which -is still being used by .B apt but that heuristic is subject to error. +is still being used by +.B apt +but that heuristic is subject to error. .SH "SEE ALSO" lsb(8) .SH AUTHOR diff --git a/lsb_release.py b/lsb_release.py index cbae155..495e7cc 100644 --- a/lsb_release.py +++ b/lsb_release.py @@ -1,7 +1,7 @@ #!/usr/bin/python # LSB release detection module for Debian -# (C) 2005-09 Chris Lawrence +# (C) 2005-10 Chris Lawrence # This package is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -40,6 +40,11 @@ RELEASE_CODENAME_LOOKUP = { TESTING_CODENAME = 'unknown.new.testing' +RELEASES_ORDER = RELEASE_CODENAME_LOOKUP.items() +RELEASES_ORDER.sort() +RELEASES_ORDER = list(zip(*RELEASES_ORDER)[1]) +RELEASES_ORDER.extend(['stable', 'testing', 'unstable', 'sid']) + def lookup_codename(release, unknown=None): m = re.match(r'(\d+)\.(\d+)(r(\d+))?', release) if not m: @@ -169,6 +174,10 @@ def guess_release_from_apt(origin='Debian', component='main', # We've sorted the list by descending priority, so the first entry should # be the "main" release in use on the system + max_priority = releases[0][0] + releases = [x for x in releases if x[0] == max_priority] + releases.sort(cmp = lambda x,y: RELEASES_ORDER.index(y[1]['suite']) - RELEASES_ORDER.index(x[1]['suite'])) + return releases[0][1] def guess_debian_release(): @@ -179,6 +188,8 @@ def guess_debian_release(): distinfo['OS'] = 'GNU/'+kern elif kern == 'FreeBSD': distinfo['OS'] = 'GNU/k'+kern + elif kern in ('GNU/Linux', 'GNU/kFreeBSD'): + distinfo['OS'] = kern else: distinfo['OS'] = 'GNU' @@ -250,7 +261,7 @@ def get_lsb_information(): if arg.startswith('"') and arg.endswith('"'): arg = arg[1:-1] if arg: # Ignore empty arguments - distinfo[var] = arg + distinfo[var] = arg.strip() except IOError, msg: print >> sys.stderr, 'Unable to open /etc/lsb-release:', str(msg) -- 2.30.2