diff -Nru lsb-3.1/debian/README.Debian lsb-3.2/debian/README.Debian --- lsb-3.1/debian/README.Debian 2007-10-04 22:15:15.000000000 +0200 +++ lsb-3.2/debian/README.Debian 2008-03-02 09:20:47.000000000 +0100 @@ -19,27 +19,35 @@ PACKAGE LAYOUT -The LSB implementation in Debian is currently divided into five +The LSB implementation in Debian is currently divided into eight packages: * The "lsb-core" package depends on the Debian packages that are - required to comply with the LSB-Core 3.1 specification; this is + required to comply with the LSB-Core 3.2 specification; this is roughly equivalent to the LSB 1.3 specification, except X11 libraries are not required. It also includes some subroutines that are used by LSB-compliant applications when they are being installed or removed. * The "lsb-graphics" package depends on the X11 libraries required for - the LSB-Graphics 3.1 specification. + the LSB-Graphics 3.2 specification. * The "lsb-cxx" package depends on libstdc++5, required for the - LSB-CXX (LSB-C++) 3.1 specification. + LSB-CXX (LSB-C++) 3.2 specification. * The "lsb-desktop" package depends on the Gtk+ and Qt libraries required - for the LSB-Desktop 3.1 specification. + for the LSB-Desktop 3.2 specification. -* The "lsb-qt4" depends on the Qt version 4 libraries required for the - LSB-Qt4 3.1 module. +* The "lsb-qt4" package depends on the Qt version 4 libraries required + for the LSB-Qt4 3.1 module. Note that this module is essentially + folded into lsb-desktop for LSB 3.2 and above. + +* The "lsb-languages" package depends on Python 2.4 and Perl 5.8.8 or later. + +* The "lsb-multimedia" package depends on libasound2. + +* The "lsb-printing" package depends on the CUPS libraries (libcupsys2 + and libcupsimage2), foomatic-rip, and Ghostscript. * The "lsb" package depends on all of the above packages, and exists for backwards compatibility purposes with LSB 1.3. @@ -95,7 +103,7 @@ The package and its dependencies implement all of LSB on Debian, with these exceptions: -- LSB 3.1 assumes a 2.4 or later kernel. Debian ships a 2.4 kernel by +- LSB 3.2 assumes a 2.4 or later kernel. Debian ships a 2.4 kernel by default on most architectures as of sarge, although 2.2 and 2.6 are optional. There is no way in the Debian system to ensure a package is only installed on a specific kernel release. Running LSB @@ -105,7 +113,7 @@ (We do not consider this a bug in the package.) -- LSB 3.1 doesn't fully specify what the init_functions should do. I +- LSB 3.2 doesn't fully specify what the init_functions should do. I have chosen to implement them in a way that is consistent with Debian current practice, using the start-stop-daemon utility and the echo command. For sarge+1, I expect a nicer init logging facility @@ -129,7 +137,11 @@ system, but does not specify the presence of either an X server or any X clients. However, many LSB packages may expect these things to be present, despite their absence from the spec. - + + Similarly, the printing specification requires the CUPS libraries + but no CUPS binaries; hence, printing may be impossible unless you + actually install the cupsys package. + (This may be a deficiency in the spec. However, we comply as-written.) - The LSB specifies that cron scripts can be placed in cron.daily and @@ -144,7 +156,7 @@ - /etc/profile.d scripts aren't executed on shell startup by default on Debian systems (see Debian Policy section 9.9 for an explanation). - LSB 3.1 is ambiguous on this requirement; /bin/sh is *not* required + LSB 3.2 is ambiguous on this requirement; /bin/sh is *not* required to execute these scripts, according to its description, but the lsbinstall documentation says that it is. @@ -199,6 +211,6 @@ An example init script that tests some of these features is provided as /usr/share/doc/lsb/examples/init-skeleton. - -- Chris Lawrence , Wed, 29 Mar 2006 17:02:17 -0500 + -- Chris Lawrence , Sun, 2 Mar 2008 02:20:47 -0600 LocalWords: LSB diff -Nru /tmp/qXUNsmyyuE/lsb-3.1/debian/changelog /tmp/b1bTRkFdyX/lsb-3.2/debian/changelog --- lsb-3.1/debian/changelog 2008-01-23 16:46:49.000000000 +0100 +++ lsb-3.2/debian/changelog 2008-03-10 20:00:16.000000000 +0100 @@ -1,3 +1,55 @@ +lsb (3.2-4ubuntu1) hardy; urgency=low + + * Merge with Debian; remaining changes: + - Depend on postfix rather than exim4 as preferred mail-transport-agent + alternative. + - Depend on libgl1-mesa-glx rather than libgl1-mesa as preferred libgl1 + alternative. + - Add Ubuntu logging functions. + - lsb: Drop the optional lsb-qt4 module to a suggests. + - Maintainer field set to Ubuntu. + + -- Matthias Klose Mon, 10 Mar 2008 18:48:17 +0000 + +lsb (3.2-4) unstable; urgency=high + + * Reverse test in killproc(). (Closes: #469404) + + -- Chris Lawrence Wed, 05 Mar 2008 13:01:08 -0600 + +lsb (3.2-3) unstable; urgency=medium + + * Handle missing $sig in killproc() properly. (Closes: #469167) + + -- Chris Lawrence Mon, 03 Mar 2008 09:01:07 -0600 + +lsb (3.2-2) unstable; urgency=low + + * lsb_release -v now detects the lsb-qt4 version(s) installed correctly. + + -- Chris Lawrence Sun, 02 Mar 2008 18:22:22 -0600 + +lsb (3.2-1) unstable; urgency=low + + * New LSB version. + + Add libpam0g, libncurses5 to lsb-base. + + Add libqt4-gui, libfreetype6, libxrender1, libxft2 to lsb-desktop. + + lsb-qt4 appears to be deprecated by the new lsb-desktop requirements. + + Add new printing, multimedia, and languages modules. + * More killproc() fixes. (Closes: #453636) + * Use /etc/debian_version in preference to apt autodetection. + (Closes: #427221) + * Handle non-zero status from start-stop-daemon better. (Closes: #451532) + * All fancy output uses /bin/echo -e now. (Closes: #463082) + * Add/update translations: + fi (Closes: #447184) + ro (Closes: #468670) + ja (Closes: #462757) + pt (Closes: #439402) + * Ignore invalid lines in /etc/lsb-release. (Closes: #454352) + + -- Chris Lawrence Sun, 02 Mar 2008 02:13:58 -0600 + lsb (3.1-24ubuntu2) hardy; urgency=low * lsb-cxx: Drop dependency on libstdc++5, not needed by LSB-3.1. @@ -235,7 +287,7 @@ (probably closes: #167757) * Use shell built-in getopts instead of /usr/bin/getopt (closes: #335216) * Remove reference to /usr/share/doc/lsb-core/html/ (closes: #380045) - * Ru translation (thanks: Yuri Kozlov ) + * Ru translation (thanks: Yuri Kozlov ) (closes: #380430) * Above changes prepared by Stephen Gran . * Update debian/TODO, which was a wee bit out of date. diff -Nru /tmp/qXUNsmyyuE/lsb-3.1/debian/control /tmp/b1bTRkFdyX/lsb-3.2/debian/control --- lsb-3.1/debian/control 2008-01-23 16:45:59.000000000 +0100 +++ lsb-3.2/debian/control 2008-03-10 20:00:59.000000000 +0100 @@ -4,8 +4,9 @@ Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: Chris Lawrence Build-Depends: debhelper (>= 5.0.37.2), po-debconf (>= 0.5.0), dpkg-dev (>= 1.10), python-central (>= 0.5), python-all-dev -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 XS-Python-Version: current +Homepage: http://www.linux-foundation.org/en/LSB Package: lsb-core Architecture: any @@ -14,12 +15,12 @@ Conflicts: lsb (<< 2.0-2) Replaces: lsb (<< 2.0-2) XB-Python-Version: ${python:Versions} -Description: Linux Standard Base 3.1 core support package +Description: Linux Standard Base 3.2 core support package The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can depend upon. . - This package provides an implementation of the core of version 3.1 of + This package provides an implementation of the core of version 3.2 of the Linux Standard Base for Debian on the Intel x86, Intel ia64 (Itanium), IBM S390, and PowerPC 32-bit architectures with the Linux kernel. Future revisions of the specification and this package may @@ -36,12 +37,12 @@ Depends: lsb-core, libgl1-mesa-glx | libgl1, libx11-6 | xlibs, ${misc:Depends} Conflicts: libutahglx1 Provides: lsb-graphics-noarch, ${provides} -Description: Linux Standard Base 3.1 graphics support package +Description: Linux Standard Base 3.2 graphics support package The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can depend upon. . - This package provides an implementation of version 3.1 of the Linux + This package provides an implementation of version 3.2 of the Linux Standard Base graphics specification for Debian on the Intel x86, Intel ia64 (Itanium), IBM S390, and PowerPC 32-bit architectures with the Linux kernel. Future revisions of the specification and this @@ -57,12 +58,12 @@ Architecture: any Depends: lsb-core, libstdc++6, ${misc:Depends} Provides: lsb-cxx-noarch, ${provides} -Description: Linux Standard Base 3.1 C++ support package +Description: Linux Standard Base 3.2 C++ support package The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can depend upon. . - This package provides an implementation of version 3.1 of the Linux + This package provides an implementation of version 3.2 of the Linux Standard Base C++ (CXX) specification for Debian on the Intel x86, Intel ia64 (Itanium), IBM S390, and PowerPC 32-bit architectures with the Linux kernel. Future revisions of the specification and this @@ -76,14 +77,14 @@ Package: lsb-desktop Architecture: any -Depends: lsb-graphics, fontconfig (>> 2.3.0), libfontconfig1 (>> 2.3.0), libpng12-0, libjpeg62, libglib2.0-0 (>> 2.6.2), libatk1.0-0 (>> 1.9.0), libpango1.0-0 (>> 1.8.0), libgtk2.0-0 (>> 2.6.2), libqt3-mt (>> 3.3.6), libxml2, ${misc:Depends} +Depends: lsb-graphics, fontconfig (>> 2.3.0), libfontconfig1 (>> 2.3.0), libpng12-0, libjpeg62, libglib2.0-0 (>> 2.6.2), libatk1.0-0 (>> 1.9.0), libpango1.0-0 (>> 1.8.0), libgtk2.0-0 (>> 2.6.2), libqt3-mt (>> 3.3.6), libqt4-gui (>= 4.2), libxml2, libfreetype6, libxrender1, libxft2, xdg-utils, ${misc:Depends} Provides: lsb-desktop-noarch, ${provides} -Description: Linux Standard Base 3.1 Desktop support package +Description: Linux Standard Base 3.2 Desktop support package The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can depend upon. . - This package provides an implementation of version 3.1 of the Linux + This package provides an implementation of version 3.2 of the Linux Standard Base Desktop specification for Debian on the Intel x86, Intel ia64 (Itanium), IBM S390, and PowerPC 32-bit architectures with the Linux kernel. Future revisions of the specification and this @@ -97,14 +98,14 @@ Package: lsb-qt4 Architecture: any -Depends: lsb-desktop, libqt4-gui +Depends: lsb-desktop (>= 3.2) Provides: lsb-qt4-noarch, ${provides} -Description: Linux Standard Base 3.1 Qt4 support package +Description: Linux Standard Base 3.2 Qt4 support package The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can depend upon. . - This package provides an implementation of version 3.1 of the Linux + This package provides an implementation of version 3.2 of the Linux Standard Base Qt4 specification for Debian on the Intel x86, Intel ia64 (Itanium), IBM S390, and PowerPC 32-bit architectures with the Linux kernel. Future revisions of the specification and this package @@ -115,17 +116,84 @@ presence does not imply that Debian fully complies with the Linux Standard Base, and should not be construed as a statement that Debian is LSB-compliant. + . + The lsb-qt4 module appears to be deprecated upstream; this package is + provided for compatibility with LSB 3.1 and may be dropped in + subsequent releases. + +Package: lsb-languages +Architecture: any +Depends: lsb-core (>= 3.2), python (>= 2.4), perl (>= 5.8.8), perl (<< 6) +Provides: lsb-languages-noarch, ${provides} +Description: Linux Standard Base 3.2 Runtime Languages package + The Linux Standard Base (http://www.linuxbase.org/) is a standard + core system that third-party applications written for Linux can + depend upon. + . + This package provides an implementation of version 3.2 of the Linux + Standard Base Languages specification for Debian on the Intel x86, + Intel ia64 (Itanium), IBM S390, and PowerPC 32-bit architectures with + the Linux kernel. Future revisions of the specification and this + package may support the LSB on additional architectures and kernels. + . + The intent of this package is to provide a best current practice way + of installing and running LSB packages on Debian GNU/Linux. Its + presence does not imply that Debian fully complies + with the Linux Standard Base, and should not be construed as a + statement that Debian is LSB-compliant. + +Package: lsb-multimedia +Architecture: any +Depends: lsb-core (>= 3.2), libasound2 +Provides: lsb-multimedia-noarch, ${provides} +Description: Linux Standard Base 3.2 Multimedia package + The Linux Standard Base (http://www.linuxbase.org/) is a standard + core system that third-party applications written for Linux can + depend upon. + . + This package provides an implementation of version 3.2 of the Linux + Standard Base Multimedia specification for Debian on the Intel x86, + Intel ia64 (Itanium), IBM S390, and PowerPC 32-bit architectures with + the Linux kernel. Future revisions of the specification and this + package may support the LSB on additional architectures and kernels. + . + The intent of this package is to provide a best current practice way + of installing and running LSB packages on Debian GNU/Linux. Its + presence does not imply that Debian fully complies + with the Linux Standard Base, and should not be construed as a + statement that Debian is LSB-compliant. + +Package: lsb-printing +Architecture: any +Depends: lsb-core (>= 3.2), libcupsys2, libcupsimage2, foomatic-filters, ghostscript +Provides: lsb-printing-noarch, ${provides} +Description: Linux Standard Base 3.2 Printing package + The Linux Standard Base (http://www.linuxbase.org/) is a standard + core system that third-party applications written for Linux can + depend upon. + . + This package provides an implementation of version 3.2 of the Linux + Standard Base Printing specification for Debian on the Intel x86, + Intel ia64 (Itanium), IBM S390, and PowerPC 32-bit architectures with + the Linux kernel. Future revisions of the specification and this + package may support the LSB on additional architectures and kernels. + . + The intent of this package is to provide a best current practice way + of installing and running LSB packages on Debian GNU/Linux. Its + presence does not imply that Debian fully complies + with the Linux Standard Base, and should not be construed as a + statement that Debian is LSB-compliant. Package: lsb Architecture: all -Depends: lsb-core, lsb-graphics, lsb-cxx, lsb-desktop +Depends: lsb-core, lsb-graphics, lsb-cxx, lsb-desktop, lsb-printing, lsb-multimedia, lsb-languages Suggests: lsb-qt4 -Description: Linux Standard Base 3.1 support package +Description: Linux Standard Base 3.2 support package The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can depend upon. . - This package provides an implementation of all modules of version 3.1 + This package provides an implementation of all modules of version 3.2 of the Linux Standard Base for Debian on the Intel x86, Intel ia64 (Itanium), IBM S390, and PowerPC 32-bit architectures with the Linux kernel. Future revisions of the specification and this package may @@ -139,11 +207,11 @@ Package: lsb-base Architecture: all -Depends: sed, ncurses-bin +Depends: sed, ncurses-bin, libncurses5, libpam0g Replaces: lsb-core (<< 2.0-6), lsb (<< 2.0-6) Conflicts: lsb-core (<< 2.0-6), lsb (<< 2.0-6) Priority: required -Description: Linux Standard Base 3.1 init script functionality +Description: Linux Standard Base 3.2 init script functionality The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can depend upon. diff -Nru /tmp/qXUNsmyyuE/lsb-3.1/debian/copyright /tmp/b1bTRkFdyX/lsb-3.2/debian/copyright --- lsb-3.1/debian/copyright 2007-10-04 22:15:15.000000000 +0200 +++ lsb-3.2/debian/copyright 2008-03-02 09:15:29.000000000 +0100 @@ -4,6 +4,7 @@ The HTML files in html/ were written by Matt Taggart Copyright: + Copyright 2002-08 Chris Lawrence and Matt Taggart 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 -Nru /tmp/qXUNsmyyuE/lsb-3.1/debian/po/fi.po /tmp/b1bTRkFdyX/lsb-3.2/debian/po/fi.po --- lsb-3.1/debian/po/fi.po 1970-01-01 01:00:00.000000000 +0100 +++ lsb-3.2/debian/po/fi.po 2008-03-02 08:33:49.000000000 +0100 @@ -0,0 +1,38 @@ +msgid "" +msgstr "" +"Project-Id-Version: lsb\n" +"Report-Msgid-Bugs-To: lawrencc@debian.org\n" +"POT-Creation-Date: 2007-05-13 09:16+0200\n" +"PO-Revision-Date: 2007-10-18 21:11+0200\n" +"Last-Translator: Esko Arajärvi \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Finnish\n" +"X-Poedit-Country: FINLAND\n" + +#. Type: boolean +#. Description +#: ../templates:2001 +msgid "Enable shadow passwords?" +msgstr "Otetaanko varjosalasanat käyttöön?" + +#. Type: boolean +#. Description +#: ../templates:2001 +msgid "The Linux Standard Base requires that certain features of adduser(8) be available to conforming applications (such as password aging). These features are only provided when shadow passwords are enabled, while this system has them disabled." +msgstr "Linux Standard Base vaatii, että tietyt ohjelman adduser(8) ominaisuudet (kuten salasanojen vanheneminen) ovat yhteensopivien ohjelmien käytettävissä. Nämä ominaisuudet ovat saatavilla vain, kun varjosalasanat ovat käytössä, mutta tässä järjestelmässä ne eivät ole käytössä." + +#. Type: boolean +#. Description +#: ../templates:2001 +msgid "Most LSB applications will work fine with either setting, but complete conformance requires shadow passwords to be enabled." +msgstr "Useimmat LSB-ohjelmat toimivat hyvin kummallakin valinnalla, mutta täydellinen yhteensopivuus vaatii, että varjosalasanat ovat käytössä." + +#. Type: boolean +#. Description +#: ../templates:2001 +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 "Yleisesti ottaen varjosalasanojen käyttöä pidetään hyvänä tapana. On kuitenkin joitain tilanteita, joissa varjosalasanat eivät välttämättä toimi oikein (eritysesti, jos ei-pääkäyttäjien tarvitsee tarkistaa salasanoja tiedoston /etc/passwd avulla)." + diff -Nru /tmp/qXUNsmyyuE/lsb-3.1/debian/po/ja.po /tmp/b1bTRkFdyX/lsb-3.2/debian/po/ja.po --- lsb-3.1/debian/po/ja.po 2007-11-19 11:39:13.000000000 +0100 +++ lsb-3.2/debian/po/ja.po 2008-03-02 08:34:39.000000000 +0100 @@ -14,81 +14,56 @@ # msgid "" msgstr "" -"Project-Id-Version: lsb 1.3-9\n" +"Project-Id-Version: lsb 3.1-24\n" "Report-Msgid-Bugs-To: lawrencc@debian.org\n" "POT-Creation-Date: 2007-05-13 09:16+0200\n" -"PO-Revision-Date: 2004-09-02 10:02+0900\n" -"Last-Translator: Hideki Yamane \n" +"PO-Revision-Date: 2008-01-27 19:52+0900\n" +"Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: boolean #. Description #: ../templates:2001 -#, fuzzy -#| msgid "Should shadow passwords be enabled?" msgid "Enable shadow passwords?" -msgstr "shadow ѥɤͭˤޤ?" +msgstr "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 " -#| "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 " "features are only provided when shadow passwords are enabled, while this " "system has them disabled." msgstr "" -"Linux Standard Base Ǥϡadduser(8) εǽ (ѥͭ¤ʤ) " -"Ŭ祢ץꥱˤʤ뤳ȤɬפȤޤDebian Ǥ shadow ѥɤ" -"ͭˤʤäΤߤˤεǽ󶡤ޤ;ΥƥǤϸ " -"shadow ѥɤ̵ˤʤäƤޤ" +"Linux Standard Base では、適合アプリケーションになるために adduser(8) の特定の" +"機能 (パスワード有効期限など) が利用できる必要があります。これらの機能は、shadow " +"パスワードが有効になった時のみに提供されますが、このシステムでは無効になっています。" #. 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 "" -"ۤȤɤ LSB ץꥱʤưޤ100% Ŭ礹ˤ " -"shadow ѥɤͭˤʤäƤɬפޤ" +"どちらの設定であっても、ほとんどの LSB アプリケーションは問題なく動作しますが、" +"LSB に完全に適合するには shadow パスワードが有効になっている必要があります。" #. 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 "" -"Ū˸äơshadow ѥɤͭˤΤɤȹͤƤ" -"ʤ顢shadow ѥɤưʤ褦ʾ⤢ޤ (" -" root ǤϤʤ桼 /etc/passwd Ȥäƥѥǧڤ򤹤ɬפ" -"ʤ)" +"一般的に言って、shadow パスワードを有効にするのは良い選択だと考えられていま" +"す。しかしながら、shadow パスワードが正しく動作しないような場合もあります (特" +"に root ではないユーザが /etc/passwd を使ってパスワード認証をする必要がある場" +"合など)。" -#~ msgid "" -#~ "If you answer in the affirmative, the command 'shadowconfig on' will be " -#~ "run to enable shadow passwords." -#~ msgstr "" -#~ "֤Ϥפϡ'shadowconfig on' ޥɤ¹Ԥ shadow ѥ" -#~ "ɤͭˤƤ" diff -Nru /tmp/qXUNsmyyuE/lsb-3.1/debian/po/pt.po /tmp/b1bTRkFdyX/lsb-3.2/debian/po/pt.po --- lsb-3.1/debian/po/pt.po 2007-11-19 11:39:13.000000000 +0100 +++ lsb-3.2/debian/po/pt.po 2008-03-02 08:34:10.000000000 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: lsb\n" "Report-Msgid-Bugs-To: lawrencc@debian.org\n" -"POT-Creation-Date: 2007-05-13 09:16+0200\n" -"PO-Revision-Date: 2007-01-23 11:01+0000\n" +"POT-Creation-Date: 2007-08-24 14:41+0000\n" +"PO-Revision-Date: 2007-08-24 21:23+0100\n" "Last-Translator: Carlos Lisboa \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" @@ -18,20 +18,12 @@ #. Type: boolean #. Description #: ../templates:2001 -#, fuzzy -#| msgid "Should shadow passwords be enabled?" msgid "Enable shadow passwords?" -msgstr "Devem as passwords 'shadow' ser activadas?" +msgstr "Activar as passwords '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 " -#| "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 " @@ -40,34 +32,23 @@ msgstr "" "O Linux Standard Base requere que determinadas funcionalidades do adduser(8) " "estejam disponíveis a aplicações conformes (tal como o envelhecimento da " -"password). Debian só disponibiliza estas funcionalidades quando as passwords " -"'shadows' estão activadas; no entanto, o seu sistema actualmente tem as " -"passwords 'shadow' desactivadas." +"password). Estas funcionalidades só estão disponíveis quando as passwords " +"'shadow' estão activadas, no entanto, no seu sistema estão desactivadas." #. 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 "" "A maioria das aplicações LSB irão funcionar correctamente com qualquer " -"opção, no entanto para haver uma conformidade a 100% as passwords 'shadow' " +"opção, no entanto para haver completa conformidade as passwords 'shadow' " "devem estar activadas." #. 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 " @@ -78,10 +59,3 @@ "entanto, existem algumas situações em que as passwords 'shadow' podem não " "funcionar correctamente (mais notavelmente, se utilizadores não-root " "precisam de autenticar passwords com o /etc/passwd)." - -#~ msgid "" -#~ "If you answer in the affirmative, the command 'shadowconfig on' will be " -#~ "run to enable shadow passwords." -#~ msgstr "" -#~ "Se responder afirmativamente, o comando 'shadowconfig on' irá correr para " -#~ "activar as passwords 'shadow'." diff -Nru /tmp/qXUNsmyyuE/lsb-3.1/debian/po/ro.po /tmp/b1bTRkFdyX/lsb-3.2/debian/po/ro.po --- lsb-3.1/debian/po/ro.po 2007-11-19 11:39:13.000000000 +0100 +++ lsb-3.2/debian/po/ro.po 2008-03-02 08:35:08.000000000 +0100 @@ -1,87 +1,63 @@ -# Romanian translation of lsb. -# Copyright (C) 2006 THE lsb'S COPYRIGHT HOLDER -# This file is distributed under the same license as the lsb package. -# Stan Ioan-Eugen , 2006. -# , fuzzy -# -# -msgid "" -msgstr "" -"Project-Id-Version: lsb 3.1-17\n" -"Report-Msgid-Bugs-To: lawrencc@debian.org\n" -"POT-Creation-Date: 2007-05-13 09:16+0200\n" -"PO-Revision-Date: 2006-12-14 17:10+0200\n" -"Last-Translator: Stan Ioan-Eugen \n" -"Language-Team: Romanian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../templates:2001 -#, fuzzy -#| msgid "Should shadow passwords be enabled?" -msgid "Enable shadow passwords?" -msgstr "Se activează parolele criptate?" - -#. 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 " -"features are only provided when shadow passwords are enabled, while this " -"system has them disabled." -msgstr "" -"Linux Standard Base cere ca anumite facilităţi ale lui adduser(8) să fie " -"conforme standardului (faciltăţi ca expirarea parolelor). Debian oferă " -"aceste facilităţi doar atunci când sunt activate parolele criptate; totuşi, " -"în prezent, parolele criptate sunt dezactivate pe sistemul dumneavoastră." - -#. 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 "" -"Majoritatea aplicaţiilor LSB vor funcţiona cu ambele setări, dar pentru " -"conformitate deplină este necesară activarea parolelor criptate." - -#. 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 "" -"În general, este bine să activaţi parolele criptate. Totuşi, există unele " -"situaţii în care parolele criptate nu vor funcţiona corespunzător (cazul cel " -"mai evident, atunci când utilizatorii obişnuiţi trebuie să autentifice " -"parolele faţă de cele din /etc/passwd)." - -#~ msgid "" -#~ "If you answer in the affirmative, the command 'shadowconfig on' will be " -#~ "run to enable shadow passwords." -#~ msgstr "" -#~ "Dacă răspundeţi afirmativ, se va rula comanda 'shadowconfig on' pentru a " -#~ "activa parolele criptate." +# Romanian translation of lsb. +# Copyright (C) 2006 THE lsb'S COPYRIGHT HOLDER +# This file is distributed under the same license as the lsb package. +# +# Stan Ioan-Eugen , 2006. +# stan ioan-eugen , 2008. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: lawrencc@debian.org\n" +"POT-Creation-Date: 2007-05-13 09:16+0200\n" +"PO-Revision-Date: 2008-02-29 22:53+0200\n" +"Last-Translator: stan ioan-eugen \n" +"Language-Team: romanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: boolean +#. Description +#: ../templates:2001 +msgid "Enable shadow passwords?" +msgstr "Se activează parolele ascunse?" + +#. Type: boolean +#. Description +#: ../templates:2001 +msgid "" +"The Linux Standard Base requires that certain features of adduser(8) be " +"available to conforming applications (such as password aging). These " +"features are only provided when shadow passwords are enabled, while this " +"system has them disabled." +msgstr "" +"Linux Standard Base cere ca anumite facilităţi ale lui adduser(8) să fie " +"conforme standardului (faciltăţi precum expirarea parolelor). Debian oferă " +"aceste facilităţi doar atunci când sunt activate parolele ascunse; totuşi, " +"în prezent, parolele ascunse sunt dezactivate pe sistemul dumneavoastră." + +#. Type: boolean +#. Description +#: ../templates:2001 +msgid "" +"Most LSB applications will work fine with either setting, but complete " +"conformance requires shadow passwords to be enabled." +msgstr "" +"Majoritatea aplicaţiilor LSB vor funcţiona cu ambele setări, dar pentru " +"conformitate deplină este necesară activarea parolelor ascunse." + +#. Type: boolean +#. Description +#: ../templates:2001 +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 "" +"În general, este bine să activaţi parolele ascunse. Totuşi, există unele " +"situaţii în care parolele ascunse nu vor funcţiona corespunzător (cazul cel " +"mai evident, atunci când utilizatorii obişnuiţi trebuie să autentifice " +"parolele faţă de cele din /etc/passwd)." + diff -Nru /tmp/qXUNsmyyuE/lsb-3.1/debian/rules /tmp/b1bTRkFdyX/lsb-3.2/debian/rules --- lsb-3.1/debian/rules 2007-10-04 22:15:16.000000000 +0200 +++ lsb-3.2/debian/rules 2008-03-10 20:00:16.000000000 +0100 @@ -70,7 +70,6 @@ rm -f build-stamp configure-stamp *.py[co] debian/lsb*substvars # Add here commands to clean up after the build process. - -$(MAKE) clean dh_clean @@ -141,6 +140,9 @@ @echo >> debian/lsb-graphics.substvars "provides=lsb-graphics-${lsbarch}" @echo >> debian/lsb-desktop.substvars "provides=lsb-desktop-${lsbarch}" @echo >> debian/lsb-qt4.substvars "provides=lsb-qt4-${lsbarch}" + @echo >> debian/lsb-multimedia.substvars "provides=lsb-multimedia-${lsbarch}" + @echo >> debian/lsb-languages.substvars "provides=lsb-languages-${lsbarch}" + @echo >> debian/lsb-printing.substvars "provides=lsb-printing-${lsbarch}" @[ ${DEB_BUILD_ARCH_CPU} = 'amd64' ] && echo >> debian/lsb-core.substvars "depends=libc6-i386, lib32z1" || true dh_link -a dh_strip -a diff -Nru /tmp/qXUNsmyyuE/lsb-3.1/init-functions /tmp/b1bTRkFdyX/lsb-3.2/init-functions --- lsb-3.1/init-functions 2007-10-04 22:15:15.000000000 +0200 +++ lsb-3.2/init-functions 2008-03-05 20:00:42.000000000 +0100 @@ -95,9 +95,10 @@ # start-stop-daemon uses the same algorithm as "pidofproc" above. killproc () { - local pidfile sig status base i name_param + local pidfile sig status base i name_param is_term_sig pidfile= name_param= + is_term_sig=no OPTIND=1 while getopts p: opt ; do @@ -115,18 +116,23 @@ 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_param + [ -n "$sig" -o "$sig" = 15 -o "$sig" = TERM ] && is_term_sig=yes + status=0 + if [ ! "$is_term_sig" = yes ]; then + if [ -n "$sig" ]; then + /sbin/start-stop-daemon --stop --signal "$sig" --pidfile "$pidfile" --quiet $name_param || status="$?" + else + /sbin/start-stop-daemon --stop --pidfile "$pidfile" --quiet $name_param || status="$?" + fi else - /sbin/start-stop-daemon --stop --pidfile "$pidfile" --retry 5 --quiet --oknodo $name_param + /sbin/start-stop-daemon --stop --pidfile "$pidfile" --retry 5 --quiet --oknodo $name_param || status="$?" fi - status="$?" if [ "$status" = 1 ]; then [ -n "$sig" ] && return 0 return 3 # program is not running fi - if [ -z "$sig" ]; then + if [ "$status" = 0 -a "$is_term_sig" = yes ]; then pidofproc -p $pidfile "$1" >/dev/null || rm -f "$pidfile" fi return 0 @@ -154,7 +160,7 @@ if log_use_fancy_output; then RED=`$TPUT setaf 1` NORMAL=`$TPUT op` - echo "$RED*$NORMAL $@" + /bin/echo -e "${RED}*${NORMAL} $@" else echo "$@" fi @@ -164,7 +170,7 @@ if log_use_fancy_output; then YELLOW=`$TPUT setaf 3` NORMAL=`$TPUT op` - echo "$YELLOW*$NORMAL $@" + /bin/echo -e "${YELLOW}*${NORMAL} $@" else echo "$@" fi diff -Nru /tmp/qXUNsmyyuE/lsb-3.1/lsb_release /tmp/b1bTRkFdyX/lsb-3.2/lsb_release --- lsb-3.1/lsb_release 2007-10-04 22:15:15.000000000 +0200 +++ lsb-3.2/lsb_release 2008-03-02 23:33:13.000000000 +0100 @@ -49,9 +49,9 @@ return RELEASE_CODENAME_LOOKUP.get(shortrelease, unknown) # LSB compliance packages... may grow eventually -PACKAGES = 'lsb-core lsb-cxx lsb-graphics lsb-desktop lsb-qt4' +PACKAGES = 'lsb-core lsb-cxx lsb-graphics lsb-desktop lsb-qt4 lsb-languages lsb-multimedia lsb-printing' -modnamere = re.compile(r'lsb-(?P[a-z]+)-(?P[^ ]+)(?: \(= (?P[0-9.]+)\))?') +modnamere = re.compile(r'lsb-(?P[a-z0-9]+)-(?P[^ ]+)(?: \(= (?P[0-9.]+)\))?') def valid_lsb_versions(version, module): # If a module is ever released that only appears in >= version, deal @@ -63,6 +63,15 @@ return ['3.1'] else: return ['2.0', '3.0', '3.1'] + elif version == '3.2': + if module == 'desktop': + return ['3.1', '3.2'] + elif module == 'qt4': + return ['3.1'] + elif module in ('printing', 'languages', 'multimedia'): + return ['3.2'] + else: + return ['2.0', '3.0', '3.1', '3.2'] return [version] @@ -183,8 +192,26 @@ 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(): + # /etc/debian_version should be numeric + codename = lookup_codename(release, 'n/a') + distinfo.update({ 'RELEASE' : release, 'CODENAME' : codename }) + else: + distinfo['RELEASE'] = release + distinfo['CODENAME'] = None + + # Only use apt information if we did not get the proper information + # from /etc/debian_version or if we don't have a codename + # (which will happen if /etc/debian_version does not contain a + # number but some text like 'testing/unstable' or 'lenny/sid') + # + # This is slightly faster and less error prone in case the user + # has an entry in his /etc/apt/sources.list but has not actually + # upgraded the system. rinfo = guess_release_from_apt() - if rinfo: + if rinfo and not distinfo['CODENAME']: release = rinfo.get('version') if release: codename = lookup_codename(release, 'n/a') @@ -196,14 +223,6 @@ 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 = lookup_codename(release, 'n/a') - distinfo.update({ 'RELEASE' : release, 'CODENAME' : codename }) - else: - distinfo['RELEASE'] = release if 'RELEASE' in distinfo: distinfo['DESCRIPTION'] += ' %(RELEASE)s' % distinfo @@ -220,6 +239,9 @@ line = line.strip() if not line: continue + # Skip invalid lines + if not '=' in line: + continue var, arg = line.split('=', 1) if var.startswith('DISTRIB_'): var = var[8:] diff -Nru /tmp/qXUNsmyyuE/lsb-3.1/lsbinstall /tmp/b1bTRkFdyX/lsb-3.2/lsbinstall --- lsb-3.1/lsbinstall 2007-10-04 22:15:15.000000000 +0200 +++ lsb-3.2/lsbinstall 2008-03-02 09:42:29.000000000 +0100 @@ -4,6 +4,7 @@ import os import shutil import socket +import commands from tempfile import NamedTemporaryFile from initdutils import load_lsbinstall_info, save_lsbinstall_info @@ -12,7 +13,7 @@ #'init', 'profile', 'service', - #'inet', # XXX - reenable when implemented + 'inet', # XXX - reenable when implemented #'crontab', #'man' ) @@ -170,8 +171,30 @@ sname, pproto, ' '.join(saliases), pkg) fp.close() -def handle_inet(options, args): - # call update-inetd +def handle_inet(options, args, parser): + cmd = 'update-inetd --group LSB ' + + alist = list(args[0].split(':')) + if len(alist) < 2: + parser.error("The operand must include a service and protocol.") + return + + if not alist[1]: + alist[1] = 'tcp' + + if options.remove: + parts = r'%s\s+.*\s+%s\s+.*' % (re.escape(alist[0], alist[1])) + cmd += '--remove '+commands.mkarg(parts) + elif options.check: + return + else: + if len(alist) != 6: + parser.error('The operand must have six colon-separated arguments.') + return + newalist = [alist[0], alist[2], alist[1]] + alist[3:] + cmd += '--add '+commands.mkarg('\t'.join(newalist)) + + os.system(cmd) pass def handle_man(options, args): @@ -231,7 +254,7 @@ parser.error('You must specify one argument when removing or checking a service entry.') handle_service(options, args) elif options.type == 'inet': - handle_inet(options, args) + handle_inet(options, args, parser) elif options.type == 'crontab': if len(args) > 1: parser.error('Only one argument supported for %s' % options.type)