lsb 3.0-4 Debian release.

diff --git a/debian/README.Debian b/debian/README.Debian
index 3cbb760bff670804e6cdf6e7af4c8913f8fdbe8c..c63d812f805a293d7f82a21247b0af6625182b06 100644 (file)
--- 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 <lawrencc@debian.org>, Mon Aug  8 15:47:37 2005
+ -- Chris Lawrence <lawrencc@debian.org>, Wed Aug 10 12:00:05 2005
 
  LocalWords:  LSB

diff --git a/debian/TODO b/debian/TODO
index 39a13de5dffd5d2feb58c1cd2258d476e6d0491e..615a76a8558094f56b4f660f73553ad3e0a8f9f9 100644 (file)
--- 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 8ee206ccc45ebfea98997bbb4faa67166c195f17..307cc0abfa83b0bb8032a80f317c07d404b46005 100644 (file)
--- 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 <lawrencc@debian.org>  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 a3519bfab665c8845eef7a483dfb2423790870a1..a6e5dcc592ebc09aa69b7d10944c397cb7f02fff 100755 (executable)
--- 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 2bcf21702f7797a7cdf62c0ce7634a868c2a70d0..162b3d0ab9fd515e90c0c83d3630133a85263e5b 100644 (file)
--- 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 d807d841f64608aed5cf274a2422ed61e06e52a2..54a1b4a0ebfe19c67ac7a7b527cc0250e666d14b 100755 (executable)
--- 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: