Author: aurel32
Date: 2010-07-27 03:15:09 +0000 (Tue, 27 Jul 2010)
New Revision: 4366
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc.postinst
glibc-package/trunk/debian/script.in/nsscheck.sh
Log:
* Look for apache2.2-common instead of apache2-common in nsscheck.
Closes: #586527.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-07-27 03:02:19 UTC (rev
4365)
+++ glibc-package/trunk/debian/changelog 2010-07-27 03:15:09 UTC (rev
4366)
@@ -12,8 +12,10 @@
[ Aurelien Jarno ]
* Always try to restart init when needed, and ignore the possible errors.
Closes: #588922, 590175.
+ * Look for apache2.2-common instead of apache2-common in nsscheck.
+ Closes: #586527.
- -- Aurelien Jarno <aure...@debian.org> Tue, 27 Jul 2010 05:00:08 +0200
+ -- Aurelien Jarno <aure...@debian.org> Tue, 27 Jul 2010 05:11:49 +0200
eglibc (2.11.2-2) unstable; urgency=medium
Modified: glibc-package/trunk/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postinst 2010-07-27
03:02:19 UTC (rev 4365)
+++ glibc-package/trunk/debian/debhelper.in/libc.postinst 2010-07-27
03:15:09 UTC (rev 4366)
@@ -91,7 +91,7 @@
ln -sf spool/mail /var/mail
fi
if dpkg --compare-versions "$preversion" lt 2.11-1; then
- check="apache2-common apache apache-ssl apache-perl autofs at"
+ check="apache2.2-common apache apache-ssl apache-perl autofs at"
check="$check boa cucipop courier-authdaemon cron cups exim"
check="$check exim4-base dovecot-common cucipop incron lprng lpr"
check="$check lpr-ppd mysql-server nis openbsd-inetd"
Modified: glibc-package/trunk/debian/script.in/nsscheck.sh
===================================================================
--- glibc-package/trunk/debian/script.in/nsscheck.sh 2010-07-27 03:02:19 UTC
(rev 4365)
+++ glibc-package/trunk/debian/script.in/nsscheck.sh 2010-07-27 03:15:09 UTC
(rev 4366)
@@ -3,7 +3,7 @@
check=$(dpkg -s $check 2> /dev/null | egrep '^Package:|^Status:' |
awk '{if ($1 ~ /^Package:/) { package=$2 } else if ($0 ~ /^Status: .*
installed$/) { print package }}')
# some init scripts don't match the package names
check=$(echo $check | \
- sed -e's/\bapache2-common\b/apache2/g' \
+ sed -e's/\bapache2.2-common\b/apache2/g' \
-e's/\bat\b/atd/g' \
-e's/\bdovecot-common\b/dovecot/g' \
-e's/\bexim4-base\b/exim4/g' \
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1odado-0008bo...@alioth.debian.org
