r3360 - in glibc-package/branches/eglibc-2.9/debian: . debhelper.in
Author: aurel32
Date: 2009-03-02 10:23:58 +0000 (Mon, 02 Mar 2009)
New Revision: 3360
Modified:
glibc-package/branches/eglibc-2.9/debian/changelog
glibc-package/branches/eglibc-2.9/debian/debhelper.in/libc.postinst
glibc-package/branches/eglibc-2.9/debian/debhelper.in/libc.preinst
Log:
Merge changes from revisions 3349-3359 from trunk to eglibc
Modified: glibc-package/branches/eglibc-2.9/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.9/debian/changelog 2009-03-02 10:03:14 UTC (rev 3359)
+++ glibc-package/branches/eglibc-2.9/debian/changelog 2009-03-02 10:23:58 UTC (rev 3360)
@@ -25,8 +25,11 @@
testsuite-checking/expected-results-i686-linux-i686: remove
testgrp.out from the ignore list, it was due to a misconfiguration
of the build daemon.
+ * debhelper.in/libc.{preinst,postint}: bump the version triggering the
+ restart of NSS related services to 2.9-5.
+ * debhelper.in/libc.postint: change cupsys into cups.
- -- Aurelien Jarno <aurel32@debian.org> Sun, 01 Mar 2009 13:52:29 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 02 Mar 2009 10:02:14 +0100
glibc (2.9-4) unstable; urgency=low
Modified: glibc-package/branches/eglibc-2.9/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/branches/eglibc-2.9/debian/debhelper.in/libc.postinst 2009-03-02 10:03:14 UTC (rev 3359)
+++ glibc-package/branches/eglibc-2.9/debian/debhelper.in/libc.postinst 2009-03-02 10:23:58 UTC (rev 3360)
@@ -141,9 +141,9 @@
if [ ! -d /var/mail ] && [ ! -L /var/mail ]; then
ln -sf spool/mail /var/mail
fi
- if dpkg --compare-versions "$preversion" lt 2.9-1; then
+ if dpkg --compare-versions "$preversion" lt 2.9-5; then
check="apache2-common apache apache-ssl apache-perl autofs at"
- check="$check boa cucipop courier-authdaemon cron cupsys exim"
+ check="$check boa cucipop courier-authdaemon cron cups exim"
check="$check exim4-base dovecot-common cucipop lprng lpr"
check="$check lpr-ppd mysql-server nis openbsd-inetd"
check="$check openldapd postfix postfix-tls rsync samba"
Modified: glibc-package/branches/eglibc-2.9/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/branches/eglibc-2.9/debian/debhelper.in/libc.preinst 2009-03-02 10:03:14 UTC (rev 3359)
+++ glibc-package/branches/eglibc-2.9/debian/debhelper.in/libc.preinst 2009-03-02 10:23:58 UTC (rev 3360)
@@ -14,7 +14,7 @@
if [ -n "$preversion" ]; then
# NSS authentication trouble guard
- if dpkg --compare-versions "$preversion" lt 2.9-1; then
+ if dpkg --compare-versions "$preversion" lt 2.9-5; then
check="gdm kdm proftpd postgresql xscreensaver xdm"
# NSS services check: NSS_CHECK
Reply to: