From 95a7549071a132ec263182443378ed2c6f840c8c Mon Sep 17 00:00:00 2001 From: Chris Lawrence Date: Wed, 6 Oct 2010 20:35:30 -0500 Subject: [PATCH] lsb 3.2-26 Debian release. --- debian/changelog | 9 ++++++ debian/lsb-core.manpages | 1 + debian/po/da.po | 60 ++++++++++------------------------------ debian/rules | 2 +- lsb_release.py | 4 +-- 5 files changed, 27 insertions(+), 49 deletions(-) create mode 100644 debian/lsb-core.manpages diff --git a/debian/changelog b/debian/changelog index afb1c37..ec0e145 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +lsb (3.2-26) unstable; urgency=low + + * Fix reversed assignment in compare_release. (Closes: #540208) + * Move lsb(8) to lsb-core package. (Closes: #589101) + * Update da translation of debconf templates; thanks to Joe Dalton. + (Closes: #599461) + + -- Chris Lawrence Wed, 06 Oct 2010 20:35:30 -0500 + lsb (3.2-25) unstable; urgency=low * Improve release comparison function when 'suite' is missing from diff --git a/debian/lsb-core.manpages b/debian/lsb-core.manpages new file mode 100644 index 0000000..44c423d --- /dev/null +++ b/debian/lsb-core.manpages @@ -0,0 +1 @@ +lsb.8 diff --git a/debian/po/da.po b/debian/po/da.po index b45e47f..358adbc 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -1,47 +1,30 @@ -# translation of lsb_1.3-8-da.po to Danish -# translation of lsb_1.3-8_templates.po to Danish -# -# 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. +# Danish translation lsb. +# Copyright (C) 2010 lsb & nedenstående oversættere. +# This file is distributed under the same license as the lsb package. # Claus Hindsgaul , 2004. +# Joe Hansen , 2010. # msgid "" msgstr "" "Project-Id-Version: lsb_1.3-8-da\n" "Report-Msgid-Bugs-To: lawrencc@debian.org\n" "POT-Creation-Date: 2007-05-13 09:16+0200\n" -"PO-Revision-Date: 2004-02-23 19:36+0100\n" -"Last-Translator: Claus Hindsgaul \n" -"Language-Team: Danish \n" +"PO-Revision-Date: 2010-10-07 05:26+0100\n" +"Last-Translator: Joe Hansen \n" +"Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.0.2\n" #. Type: boolean #. Description #: ../templates:2001 -#, fuzzy -#| msgid "Should shadow passwords be enabled?" msgid "Enable shadow passwords?" -msgstr "Skal skyggeadgangskoder aktiveres?" +msgstr "Aktiver skyggeadgangskoder?" #. 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 " -#| "only provides these features when shadow passwords are enabled; however, " -#| "your system currently has shadow passwords disabled." msgid "" "The Linux Standard Base requires that certain features of adduser(8) be " "available to conforming applications (such as password aging). These " @@ -49,46 +32,31 @@ msgid "" "system has them disabled." msgstr "" "Linux Standardbasis kræver at visse af adduser(8)'s funktioner (såsom " -"tidsudløb for adgangskoder) gøres tilgængelige til programmer. Debian har " -"kun disse funktioner, hvis skyggeadgangskoder aktiveres. Det er de dog ikke " -"på dit system." +"tidsudløb for adgangskoder) gøres tilgængelige til programmer. Disse " +"funktioner tilbydes kun hvis skyggeadgangskoder aktiveres. Det er de " +"dog ikke på dit system." #. 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." msgid "" "Most LSB applications will work fine with either setting, but complete " "conformance requires shadow passwords to be enabled." msgstr "" "De fleste LSB-programmer vil fungere udmærket med begge indstillinger, men " -"100% LSB-tilpasning kræver at skyggeadgangskoder bliver aktiveret." +"100 % tilpasning kræver, at skyggeadgangskoder bliver aktiveret." #. 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 " -#| "may not work properly (most notably, if non-root users need to " -#| "authenticate passwords against /etc/passwd)." msgid "" "Generally speaking, it is considered good practice to enable shadow " "passwords. However, there are some situations in which shadow passwords may " "not work properly (most notably, if non-root users need to check passwords " "against /etc/passwd)." msgstr "" -"Generelt er det en god idé at aktivere skyggeadgangskoder. Der kan dog være " +"Generelt er det en god ide at aktivere skyggeadgangskoder. Der kan dog være " "situationer, hvor de ikke fungerer ordentligt (f.eks. hvis ikke-root brugere " "skal autentificere adgangskoder ved hjælp af /etc/passwd)." -#~ msgid "" -#~ "If you answer in the affirmative, the command 'shadowconfig on' will be " -#~ "run to enable shadow passwords." -#~ msgstr "" -#~ "Hvis du accepterer, vil kommandoen 'shadowconfig on' blive kørt for at " -#~ "aktivere skyggeadgangskoder." + diff --git a/debian/rules b/debian/rules index ad01c0f..b297057 100755 --- a/debian/rules +++ b/debian/rules @@ -129,7 +129,7 @@ binary-arch: build install # dh_installmime # dh_installinit dh_installcron -a - dh_installman -a lsb.8 + dh_installman -a dh_installinfo -a # dh_undocumented dh_installchangelogs -a diff --git a/lsb_release.py b/lsb_release.py index 51e6978..adbc24d 100644 --- a/lsb_release.py +++ b/lsb_release.py @@ -137,8 +137,8 @@ def parse_policy_line(data): return retval def compare_release(x, y): - suite_x = y[1].get('suite') - suite_y = x[1].get('suite') + suite_x = x[1].get('suite') + suite_y = y[1].get('suite') if suite_x and suite_y: if suite_x in RELEASES_ORDER and suite_y in RELEASES_ORDER: -- 2.30.2