X Strike Force Render SVN commit: r38 - trunk/debian
Author: branden
Date: 2004-02-16 15:28:03 -0500 (Mon, 16 Feb 2004)
New Revision: 38
Modified:
trunk/debian/render-dev.preinst
Log:
Improve reliability of check for installed diversion made by render-dev.
Modified: trunk/debian/render-dev.preinst
===================================================================
--- trunk/debian/render-dev.preinst 2004-02-16 18:35:18 UTC (rev 37)
+++ trunk/debian/render-dev.preinst 2004-02-16 20:28:03 UTC (rev 38)
@@ -8,15 +8,15 @@
# Eliminate diversions created by render-dev (<= 0.8-3). "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/include/X11/extensions/render.h)" != \
- "" ]; then
+ if dpkg-divert --list /usr/X11R6/include/X11/extensions/render.h | \
+ grep '\<render-dev$'; then
dpkg-divert --package render-dev --remove --rename \
--divert /usr/X11R6/include/X11/extensions/render-0.2.h \
/usr/X11R6/include/X11/extensions/render.h
fi
- if [ "$(dpkg-divert --list \
- /usr/X11R6/include/X11/extensions/renderproto.h)" != "" ]; then
+ if dpkg-divert --list /usr/X11R6/include/X11/extensions/renderproto.h | \
+ grep '\<render-dev$'; then
dpkg-divert --package render-dev --remove --rename \
--divert /usr/X11R6/include/X11/extensions/renderproto-0.2.h \
/usr/X11R6/include/X11/extensions/renderproto.h
Reply to: