r3381 - in glibc-package/trunk/debian: . control.in debhelper.in local/etc_init.d
Author: aurel32
Date: 2009-03-15 18:56:20 +0000 (Sun, 15 Mar 2009)
New Revision: 3381
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/debhelper.in/nscd.init
glibc-package/trunk/debian/local/etc_init.d/glibc.sh
Log:
* debian/control.in/main: update Standards-Version to 3.8.1:
- debian/local/etc_init.d/glibc.sh: move set -e out from the shebang line.
- debian/debhelper.in/nscd.init: exit succesfully if the daemon was already
running.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-03-15 18:45:51 UTC (rev 3380)
+++ glibc-package/trunk/debian/changelog 2009-03-15 18:56:20 UTC (rev 3381)
@@ -16,8 +16,12 @@
associated addresses when checking for native connection. Closes:
bug#519545.
* debian/control.in/libc: change -dbg packages to section debug.
+ * debian/control.in/main: update Standards-Version to 3.8.1:
+ - debian/local/etc_init.d/glibc.sh: move set -e out from the shebang line.
+ - debian/debhelper.in/nscd.init: exit succesfully if the daemon was already
+ running.
- -- Aurelien Jarno <aurel32@debian.org> Sun, 15 Mar 2009 19:45:14 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 15 Mar 2009 19:49:38 +0100
glibc (2.9-5) unstable; urgency=low
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2009-03-15 18:45:51 UTC (rev 3380)
+++ glibc-package/trunk/debian/control 2009-03-15 18:56:20 UTC (rev 3381)
@@ -12,7 +12,7 @@
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: Ben Collins <bcollins@debian.org>, GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Aurelien Jarno <aurel32@debian.org>, Pierre Habouzit <madcoder@debian.org>
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Vcs-Browser: http://svn.debian.org/wsvn/pkg-glibc/glibc-package/
Vcs-Svn: svn://svn.debian.org/pkg-glibc/glibc-package/
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2009-03-15 18:45:51 UTC (rev 3380)
+++ glibc-package/trunk/debian/control.in/main 2009-03-15 18:56:20 UTC (rev 3381)
@@ -12,7 +12,7 @@
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: Ben Collins <bcollins@debian.org>, GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Aurelien Jarno <aurel32@debian.org>, Pierre Habouzit <madcoder@debian.org>
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Vcs-Browser: http://svn.debian.org/wsvn/pkg-glibc/glibc-package/
Vcs-Svn: svn://svn.debian.org/pkg-glibc/glibc-package/
Modified: glibc-package/trunk/debian/debhelper.in/nscd.init
===================================================================
--- glibc-package/trunk/debian/debhelper.in/nscd.init 2009-03-15 18:45:51 UTC (rev 3380)
+++ glibc-package/trunk/debian/debhelper.in/nscd.init 2009-03-15 18:56:20 UTC (rev 3381)
@@ -33,10 +33,9 @@
start_nscd()
{
# Return
- # 0 if daemon has been started
- # 1 if daemon was already running
+ # 0 if daemon has been started or was already running
# 2 if daemon could not be started
- start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON" --test > /dev/null || return 1
+ start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON" --test > /dev/null || return 0
start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON" || return 2
}
Modified: glibc-package/trunk/debian/local/etc_init.d/glibc.sh
===================================================================
--- glibc-package/trunk/debian/local/etc_init.d/glibc.sh 2009-03-15 18:45:51 UTC (rev 3380)
+++ glibc-package/trunk/debian/local/etc_init.d/glibc.sh 2009-03-15 18:56:20 UTC (rev 3381)
@@ -1,4 +1,4 @@
-#! /bin/sh -e
+#! /bin/sh
#
### BEGIN INIT INFO
# Provides: glibc
@@ -12,6 +12,8 @@
### END INIT INFO
#
+set -e
+
# glibc kernel version check: KERNEL_VERSION_CHECK
: exit 0
Reply to: