X Strike Force Render SVN commit: r41 - trunk/debian
Author: branden
Date: 2004-02-19 22:51:46 -0500 (Thu, 19 Feb 2004)
New Revision: 41
Modified:
trunk/debian/changelog
trunk/debian/render-dev.preinst
Log:
Because previous versions' postrm scripts (mistakenly, as it turns out)
only removed the diversion only on package removal, not upgrades, we have
to manually remove the undiverted copy of each file.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-02-20 02:56:27 UTC (rev 40)
+++ trunk/debian/changelog 2004-02-20 03:51:46 UTC (rev 41)
@@ -9,7 +9,7 @@
of render-dev if present
- debian/render-dev.postrm: deleted
- -- Branden Robinson <branden@debian.org> Thu, 19 Feb 2004 21:56:12 -0500
+ -- Branden Robinson <branden@debian.org> Thu, 19 Feb 2004 22:49:42 -0500
render (0.8-3) unstable; urgency=low
Modified: trunk/debian/render-dev.preinst
===================================================================
--- trunk/debian/render-dev.preinst 2004-02-20 02:56:27 UTC (rev 40)
+++ trunk/debian/render-dev.preinst 2004-02-20 03:51:46 UTC (rev 41)
@@ -7,9 +7,13 @@
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
# 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.
+ # output to the null string. Because previous versions' postrm scripts
+ # (mistakenly, as it turns out) only removed the diversion only on package
+ # removal, not upgrades, we have to manually remove the undiverted copy of
+ # each file.
if dpkg-divert --list /usr/X11R6/include/X11/extensions/render.h | \
grep '\<render-dev$'; then
+ rm /usr/X11R6/include/X11/extensions/render.h
dpkg-divert --package render-dev --remove --rename \
--divert /usr/X11R6/include/X11/extensions/render-0.2.h \
/usr/X11R6/include/X11/extensions/render.h
@@ -17,6 +21,7 @@
if dpkg-divert --list /usr/X11R6/include/X11/extensions/renderproto.h | \
grep '\<render-dev$'; then
+ rm /usr/X11R6/include/X11/extensions/renderproto.h
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: