From 0d1b642afa3dc5eab8c3619554556c313f8da5ce Mon Sep 17 00:00:00 2001 From: Chris Lawrence Date: Wed, 10 Aug 2005 12:00:57 -0500 Subject: [PATCH] lsb 3.0-4 Debian release. --- debian/README.Debian | 27 ++++++++++++++++++++++++++- debian/TODO | 3 +++ debian/changelog | 8 ++++++++ debian/postinst | 6 +++--- debian/prerm | 2 +- debian/rules | 5 ++++- 6 files changed, 45 insertions(+), 6 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index 3cbb760..c63d812 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -43,6 +43,31 @@ packages: lsb 2.0-6 package so other packages could make use of the init functionality without requiring a full LSB installation. + Debian also provides a series of logging functions to permit + simplified logging of init script actions: + + - log_daemon_msg "Starting/stopping long daemon name" "daemond" + + Log starting/stopping of daemons. On Debian, outputs: + + "Starting/stopping long daemon name: daemond" + + and leaves the cursor at the end of the line. + + - log_progress_msg "daemon2d" + + Log startup of a second daemon (e.g. sysklogd, nfs init scripts). + On Debian, outputs " daemon2d" and leaves the cursor at the EOL. + + - log_end_msg 0 + + Log successful startup. On Debian, outputs "." followed by newline. + 1 may also be specified, which indicates failure; currently implemented + as outputting "failed!" (in red on a color TTY) followed by newline. + + A deprecated function, log_start_msg, is also provided for compatibility + with a few older packages and a derived distribution. + The first three packages are architecture-specific because of differences in the requirements of the LSB on various binary architectures. In particular, each package provides @@ -187,6 +212,6 @@ any reports of its success or failure. An example init script that tests some of these features is provided as /usr/share/doc/lsb/examples/init-skeleton. - -- Chris Lawrence , Mon Aug 8 15:47:37 2005 + -- Chris Lawrence , Wed Aug 10 12:00:05 2005 LocalWords: LSB diff --git a/debian/TODO b/debian/TODO index 39a13de..615a76a 100644 --- a/debian/TODO +++ b/debian/TODO @@ -1,5 +1,8 @@ A quickie TODO list for lsb*: +* Make output format for logging functions configurable. (#321963) +* Finish lsbinstall +* Move lsb-release into this package; rewrite. (#135832) * Move dynamic linker symlinks from postinst into package itself. * Support additional Debian architectures. * Only build lsb-* for LSB architectures in Debian. diff --git a/debian/changelog b/debian/changelog index 8ee206c..307cc0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +lsb (3.0-4) unstable; urgency=medium + + * Fix LIBC setting; add Alpha support. (Closes: #322316) + * Add support for PPC64. (Closes: #322293) + * Document usage of log_*_msg in README.Debian. + + -- Chris Lawrence Wed, 10 Aug 2005 12:00:57 -0500 + lsb (3.0-3) unstable; urgency=low * Upload to unstable, since glibc 2.3.5 is now in. diff --git a/debian/postinst b/debian/postinst index a3519bf..a6e5dcc 100755 --- a/debian/postinst +++ b/debian/postinst @@ -3,9 +3,9 @@ setup_ldso_symlink () { ARCH=`dpkg --print-installation-architecture` case "$ARCH" in - s390) - ln -sf ld.so.1 /lib/ld-lsb-s390.so.1 - ln -sf ld.so.1 /lib/ld-lsb-s390.so.2 + s390|ppc64) + ln -sf ld.so.1 /lib/ld-lsb-$ARCH.so.1 + ln -sf ld.so.1 /lib/ld-lsb-$ARCH.so.2 ;; powerpc) ln -sf ld.so.1 /lib/ld-lsb-ppc32.so.1 diff --git a/debian/prerm b/debian/prerm index 2bcf217..162b3d0 100644 --- a/debian/prerm +++ b/debian/prerm @@ -3,7 +3,7 @@ remove_ldso_symlink () { ARCH=`dpkg --print-installation-architecture` case "$ARCH" in - s390|ia64) + s390|ia64|ppc64) rm -f /lib/ld-lsb-$ARCH.so.[12] ;; powerpc) diff --git a/debian/rules b/debian/rules index d807d84..54a1b4a 100755 --- a/debian/rules +++ b/debian/rules @@ -27,13 +27,16 @@ ifeq (${lsbarch}, powerpc) lsbarch=ppc32 endif -LIBC=glibc (>> 2.3.5) +LIBC=libc6 (>> 2.3.5) ifeq (${lsbarch}, hurd-i386) LIBC=libc0.3 (>> 2.3.5) endif ifeq (${lsbarch}, ia64) LIBC=libc6.1 (>> 2.3.5) endif +ifeq (${lsbarch}, alpha) +LIBC=libc6.1 (>> 2.3.5) +endif configure: configure-stamp configure-stamp: -- 2.30.2