From 3e8720cca53942f818427dca8cec8dd4f5253b7a Mon Sep 17 00:00:00 2001 From: Chris Lawrence Date: Wed, 26 Mar 2008 10:26:53 -0500 Subject: [PATCH] lsb 3.2-5 Debian release. --- debian/changelog | 13 +++++++++++++ debian/control | 7 ++++--- debian/rules | 3 ++- init-functions | 20 +++++++++++++++----- 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2758bd1..86cd3be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +lsb (3.2-5) unstable; urgency=low + + * Fix init-functions with set -e. (Closes: #472794) + Patch from Matthias Klose. + * Downgrade optional LSB modules to suggestions from main "lsb" package + (core LSB dependency for LSB 1.x); remove obsolete lsb-qt4 from its + dependencies. + * lsb-desktop now provides lsb-qt4*, essentially making lsb-qt4 a dummy + package. + * lsb-cxx: Don't depend on libstdc++5 on armel. + + -- Chris Lawrence Wed, 26 Mar 2008 10:26:53 -0500 + lsb (3.2-4) unstable; urgency=high * Reverse test in killproc(). (Closes: #469404) diff --git a/debian/control b/debian/control index 3cf7634..2dea7d5 100644 --- a/debian/control +++ b/debian/control @@ -55,7 +55,7 @@ Description: Linux Standard Base 3.2 graphics support package Package: lsb-cxx Architecture: any -Depends: lsb-core, libstdc++5, libstdc++6, ${misc:Depends} +Depends: lsb-core, libstdc++6, ${misc:Depends}, ${depends} Provides: lsb-cxx-noarch, ${provides} Description: Linux Standard Base 3.2 C++ support package The Linux Standard Base (http://www.linuxbase.org/) is a standard @@ -77,7 +77,7 @@ Description: Linux Standard Base 3.2 C++ support package 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), libqt4-gui (>= 4.2), libxml2, libfreetype6, libxrender1, libxft2, xdg-utils, ${misc:Depends} -Provides: lsb-desktop-noarch, ${provides} +Provides: lsb-desktop-noarch, lsb-qt4, lsb-qt4-noarch, ${provides} 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 @@ -185,7 +185,8 @@ Description: Linux Standard Base 3.2 Printing package Package: lsb Architecture: all -Depends: lsb-core, lsb-graphics, lsb-cxx, lsb-desktop, lsb-qt4, lsb-printing, lsb-multimedia, lsb-languages +Depends: lsb-core, lsb-graphics, lsb-cxx, lsb-desktop +Suggests: lsb-printing, lsb-multimedia, lsb-languages 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 diff --git a/debian/rules b/debian/rules index 7256502..94de165 100755 --- a/debian/rules +++ b/debian/rules @@ -134,10 +134,11 @@ binary-arch: build install # dh_undocumented dh_installchangelogs -a @echo >> debian/lsb-core.substvars "glibc=${LIBC}" + @[ ${DEB_BUILD_ARCH_CPU} != 'armel' ] && echo >> debian/lsb-cxx.substvars "depends=libstdc++5" || true @echo >> debian/lsb-core.substvars "provides=lsb-core-${lsbarch}" @echo >> debian/lsb-cxx.substvars "provides=lsb-cxx-${lsbarch}" @echo >> debian/lsb-graphics.substvars "provides=lsb-graphics-${lsbarch}" - @echo >> debian/lsb-desktop.substvars "provides=lsb-desktop-${lsbarch}" + @echo >> debian/lsb-desktop.substvars "provides=lsb-qt4-${lsbarch}, 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}" diff --git a/init-functions b/init-functions index 47634ee..3b72d75 100644 --- a/init-functions +++ b/init-functions @@ -43,7 +43,9 @@ start_daemon () { done shift $(($OPTIND - 1)) - [ "$1" = '--' ] && shift + if [ "$1" = '--' ]; then + shift + fi exec="$1"; shift @@ -87,7 +89,9 @@ pidofproc () { if [ -x /bin/pidof -a ! "$specified" ]; then /bin/pidof -o %PPID $1 status="$?" - [ "$status" = 1 ] && return 3 # program is not running + if [ "$status" = 1 ]; then + return 3 # program is not running + fi return 0 fi return 4 # program or service is unknown @@ -116,7 +120,9 @@ killproc () { sig=$(echo ${2:-} | sed -e 's/^-\(.*\)/\1/') sig=$(echo $sig | sed -e 's/^SIG\(.*\)/\1/') - [ -n "$sig" -o "$sig" = 15 -o "$sig" = TERM ] && is_term_sig=yes + if [ -n "$sig" -o "$sig" = 15 -o "$sig" = TERM ]; then + is_term_sig=yes + fi status=0 if [ ! "$is_term_sig" = yes ]; then if [ -n "$sig" ]; then @@ -128,7 +134,9 @@ killproc () { /sbin/start-stop-daemon --stop --pidfile "$pidfile" --retry 5 --quiet --oknodo $name_param || status="$?" fi if [ "$status" = 1 ]; then - [ -n "$sig" ] && return 0 + if [ -n "$sig" ]; then + return 0 + fi return 3 # program is not running fi @@ -250,7 +258,9 @@ log_progress_msg () { # int log_end_message (int exitstatus) log_end_msg () { # If no arguments were passed, return - [ -z "${1:-}" ] && return 1 + if [ -z "${1:-}" ]; then + return 1 + fi # Only do the fancy stuff if we have an appropriate terminal # and if /usr is already mounted -- 2.30.2