X Strike Force Xrender SVN commit: r87 - trunk/debian
Author: branden
Date: 2004-02-16 15:38:58 -0500 (Mon, 16 Feb 2004)
New Revision: 87
Modified:
trunk/debian/libxrender-dev.preinst
trunk/debian/libxrender1-dbg.preinst
trunk/debian/libxrender1.preinst
Log:
Improve reliability of check for installed diversions made by libxrender1,
libxrender1-dbg, and libxrender-dev.
Modified: trunk/debian/libxrender-dev.preinst
===================================================================
--- trunk/debian/libxrender-dev.preinst 2004-02-16 20:33:48 UTC (rev 86)
+++ trunk/debian/libxrender-dev.preinst 2004-02-16 20:38:58 UTC (rev 87)
@@ -6,24 +6,22 @@
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
# Eliminate diversions created by libxrender-dev (<= 0.8.3-5).
- # "dpkg-divert --list" does not have a useful exit status, so we have to
- # compare its output to the null string.
- if [ "$(dpkg-divert --list /usr/X11R6/lib/libXrender.a)" != \
- "" ]; then
+ if dpkg-divert --list /usr/X11R6/lib/libXrender.a | \
+ grep '\<libxrender-dev$'; then
dpkg-divert --package libxrender-dev --remove --rename \
--divert /usr/X11R6/lib/libXrender-1.1.a \
/usr/X11R6/lib/libXrender.a
fi
- if [ "$(dpkg-divert --list /usr/X11R6/lib/libXrender.so)" != \
- "" ]; then
+ if dpkg-divert --list /usr/X11R6/lib/libXrender.so | \
+ grep '\<libxrender-dev$'; then
dpkg-divert --package libxrender-dev --remove --rename \
--divert /usr/X11R6/lib/libXrender-1.1.so \
/usr/X11R6/lib/libXrender.so
fi
- if [ "$(dpkg-divert --list \
- /usr/X11R6/include/X11/extensions/Xrender.h)" != "" ]; then
+ if dpkg-divert --list /usr/X11R6/include/X11/extensions/Xrender.h | \
+ grep '\<libxrender-dev$'; then
dpkg-divert --package libxrender-dev --remove --rename \
--divert /usr/X11R6/include/X11/extensions/Xrender-1.1.h \
/usr/X11R6/include/X11/extensions/Xrender.h
Modified: trunk/debian/libxrender1-dbg.preinst
===================================================================
--- trunk/debian/libxrender1-dbg.preinst 2004-02-16 20:33:48 UTC (rev 86)
+++ trunk/debian/libxrender1-dbg.preinst 2004-02-16 20:38:58 UTC (rev 87)
@@ -6,13 +6,11 @@
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
# Eliminate diversions created by libxrender1-dbg (<= 0.8.3-5).
- # "dpkg-divert --list" does not have a useful exit status, so we have to
- # compare its output to the null string.
- if [ "$(dpkg-divert --list /usr/X11R6/lib/debug/libXrender.so.1)" != \
- "" ]; then
- dpkg-divert --package libxrender1-dbg --remove --rename \
- --divert /usr/X11R6/lib/debug/libXrender-1.1.so.1 \
- /usr/X11R6/lib/debug/libXrender.so.1
+ if dpkg-divert --list /usr/X11R6/lib/debug/libXrender.so.1 |
+ grep '\<libxrender1-dbg$'; then
+ dpkg-divert --package libxrender1-dbg --remove --rename \
+ --divert /usr/X11R6/lib/debug/libXrender-1.1.so.1 \
+ /usr/X11R6/lib/debug/libXrender.so.1
fi
fi
Modified: trunk/debian/libxrender1.preinst
===================================================================
--- trunk/debian/libxrender1.preinst 2004-02-16 20:33:48 UTC (rev 86)
+++ trunk/debian/libxrender1.preinst 2004-02-16 20:38:58 UTC (rev 87)
@@ -5,18 +5,16 @@
set -e
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
- # Eliminate diversions created by libxrender1 (<= 0.8.3-5). "dpkg-divert
- # --list" does not have a useful exit status, so we have to compare its
- # output to the null string.
- if [ "$(dpkg-divert --list /usr/X11R6/lib/libXrender.so.1.1)" != \
- "" ]; then
+ # Eliminate diversions created by libxrender1 (<= 0.8.3-5).
+ if dpkg-divert --list /usr/X11R6/lib/libXrender.so.1.1 | \
+ grep '\<libxrender1$'; then
dpkg-divert --package libxrender1 --remove --rename \
--divert /usr/X11R6/lib/xlibs.libXrender-1.1.so.1.1 \
/usr/X11R6/lib/libXrender.so.1.1
fi
- if [ "$(dpkg-divert --list /usr/X11R6/lib/libXrender.so.1)" != \
- "" ]; then
+ if dpkg-divert --list /usr/X11R6/lib/libXrender.so.1 | \
+ grep '\<libxrender1$'; then
dpkg-divert --package libxrender1 --remove --rename \
--divert /usr/X11R6/lib/libXrender-1.1.so.1 \
/usr/X11R6/lib/libXrender.so.1
Reply to: