Author: schizo
Date: 2006-02-24 15:18:03 +0000 (Fri, 24 Feb 2006)
New Revision: 1234
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc.postinst
glibc-package/trunk/debian/local/usr_sbin/tzconfig
Log:
* Get rid of -o as a binary operator to [ in tzconfig and postinst.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-02-24 14:38:44 UTC (rev
1233)
+++ glibc-package/trunk/debian/changelog 2006-02-24 15:18:03 UTC (rev
1234)
@@ -4,6 +4,9 @@
* Use a shell function instead of ifneq when testing a variable depending on
$(curpass), otherwise it is only evaluated at the first pass.
+ [ Clint Adams ]
+ * Get rid of -o as a binary operator to [ in tzconfig and postinst.
+
-- Aurelien Jarno <[EMAIL PROTECTED]> Thu, 23 Feb 2006 21:46:25 +0100
glibc (2.3.6-2) unstable; urgency=low
Modified: glibc-package/trunk/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postinst 2006-02-24
14:38:44 UTC (rev 1233)
+++ glibc-package/trunk/debian/debhelper.in/libc.postinst 2006-02-24
15:18:03 UTC (rev 1234)
@@ -180,7 +180,7 @@
# something weird happened and the new libdb2 is unpacked before we
# get here.
if [ -e /lib/libdb.so.3.old ]; then
- if [ -L /lib/libdb.so.3 -o ! -e /lib/libdb.so.3 ]; then
+ if [ -L /lib/libdb.so.3 ] || [ ! -e /lib/libdb.so.3 ]; then
rm -f /lib/libdb.so.3
cat /lib/libdb.so.3.old > /lib/libdb.so.3
fi
@@ -297,7 +297,7 @@
check="$check inetd atd"
rl=$(runlevel | awk '{print $2}')
for service in $check; do
- if [ -f /usr/share/file-rc/rc -o -f /usr/lib/file-rc/rc ] && [
-f /etc/runlevel.conf ]; then
+ if [ -f /usr/share/file-rc/rc ] || [ -f /usr/lib/file-rc/rc ]
&& [ -f /etc/runlevel.conf ]; then
idl=$(filerc $rl $service)
else
idl=$(ls /etc/rc${rl}.d/S??${service} 2> /dev/null | head
-1)
@@ -341,7 +341,7 @@
echo "Restarting services possibly affected by the upgrade:"
failed=""
for service in $services; do
- if [ -f /usr/share/file-rc/rc -o -f /usr/lib/file-rc/rc
] && [ -f /etc/runlevel.conf ]; then
+ if [ -f /usr/share/file-rc/rc ] || [ -f
/usr/lib/file-rc/rc ] && [ -f /etc/runlevel.conf ]; then
idl=$(filerc $rl $service)
else
idl=$(ls /etc/rc${rl}.d/S??${service} 2> /dev/null
| head -1)
Modified: glibc-package/trunk/debian/local/usr_sbin/tzconfig
===================================================================
--- glibc-package/trunk/debian/local/usr_sbin/tzconfig 2006-02-24 14:38:44 UTC
(rev 1233)
+++ glibc-package/trunk/debian/local/usr_sbin/tzconfig 2006-02-24 15:18:03 UTC
(rev 1234)
@@ -48,7 +48,7 @@
echo "Your current time zone is set to `cat /etc/timezone`"
echo -n "Do you want to change that? [n]: "
read ans
- if [ "x$ans" = "x" -o "$ans" = "n" -o "$ans" = "no" ]; then
+ if [ "x$ans" = "x" ] || [ "$ans" = "n" ] || [ "$ans" = "no" ]; then
echo "Your time zone will not be changed"
exit 0
fi
@@ -57,7 +57,7 @@
echo "Your current time zone is set to $oldtimezone"
echo -n "Do you want to change that? [n]: "
read ans
- if [ "x$ans" = "x" -o "$ans" = "n" -o "$ans" = "no" ]; then
+ if [ "x$ans" = "x" ] || [ "$ans" = "n" ] || [ "$ans" = "no" ]; then
echo "Your time zone will not be changed"
exit 0
fi
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
