Author: branden
Date: 2004-02-20 00:58:04 -0500 (Fri, 20 Feb 2004)
New Revision: 91
Modified:
trunk/debian/libxrender-dev.preinst
trunk/debian/libxrender1-dbg.preinst
trunk/debian/libxrender1.preinst
Log:
Because previous versions' postrm scripts (mistakenly, as it turns out)
removed the diversion only on package removal, not upgrades, we have to
manually remove the undiverted copy of each file.
Modified: trunk/debian/libxrender-dev.preinst
===================================================================
--- trunk/debian/libxrender-dev.preinst 2004-02-20 03:07:41 UTC (rev 90)
+++ trunk/debian/libxrender-dev.preinst 2004-02-20 05:58:04 UTC (rev 91)
@@ -5,9 +5,13 @@
set -e
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
- # Eliminate diversions created by libxrender-dev (<= 0.8.3-5).
+ # Eliminate diversions created by libxrender-dev (<= 0.8.3-5). Because
+ # previous versions' postrm scripts (mistakenly, as it turns out) 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/lib/libXrender.a | \
grep '\<libxrender-dev$'; then
+ rm -f /usr/X11R6/lib/libXrender.a
dpkg-divert --package libxrender-dev --remove --rename \
--divert /usr/X11R6/lib/libXrender-1.1.a \
/usr/X11R6/lib/libXrender.a
@@ -15,6 +19,7 @@
if dpkg-divert --list /usr/X11R6/lib/libXrender.so | \
grep '\<libxrender-dev$'; then
+ rm -f /usr/X11R6/lib/libXrender.so
dpkg-divert --package libxrender-dev --remove --rename \
--divert /usr/X11R6/lib/libXrender-1.1.so \
/usr/X11R6/lib/libXrender.so
@@ -22,6 +27,7 @@
if dpkg-divert --list /usr/X11R6/include/X11/extensions/Xrender.h | \
grep '\<libxrender-dev$'; then
+ rm -f /usr/X11R6/include/X11/extensions/Xrender.h
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-20 03:07:41 UTC (rev 90)
+++ trunk/debian/libxrender1-dbg.preinst 2004-02-20 05:58:04 UTC (rev 91)
@@ -5,9 +5,13 @@
set -e
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
- # Eliminate diversions created by libxrender1-dbg (<= 0.8.3-5).
+ # Eliminate diversions created by libxrender1-dbg (<= 0.8.3-5). 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/lib/debug/libXrender.so.1 |
grep '\<libxrender1-dbg$'; then
+ rm -f /usr/X11R6/lib/debug/libXrender.so.1
dpkg-divert --package libxrender1-dbg --remove --rename \
--divert /usr/X11R6/lib/debug/libXrender-1.1.so.1 \
/usr/X11R6/lib/debug/libXrender.so.1
Modified: trunk/debian/libxrender1.preinst
===================================================================
--- trunk/debian/libxrender1.preinst 2004-02-20 03:07:41 UTC (rev 90)
+++ trunk/debian/libxrender1.preinst 2004-02-20 05:58:04 UTC (rev 91)
@@ -5,9 +5,13 @@
set -e
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
- # Eliminate diversions created by libxrender1 (<= 0.8.3-5).
+ # Eliminate diversions created by libxrender1 (<= 0.8.3-5). Because
+ # previous versions' postrm scripts (mistakenly, as it turns out) 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/lib/libXrender.so.1.1 | \
grep '\<libxrender1$'; then
+ rm -f /usr/X11R6/lib/libXrender.so.1.1
dpkg-divert --package libxrender1 --remove --rename \
--divert /usr/X11R6/lib/xlibs.libXrender-1.1.so.1.1 \
/usr/X11R6/lib/libXrender.so.1.1
@@ -15,6 +19,7 @@
if dpkg-divert --list /usr/X11R6/lib/libXrender.so.1 | \
grep '\<libxrender1$'; then
+ rm -f /usr/X11R6/lib/libXrender.so.1
dpkg-divert --package libxrender1 --remove --rename \
--divert /usr/X11R6/lib/libXrender-1.1.so.1 \
/usr/X11R6/lib/libXrender.so.1
