[pkg-nvidia-devel] r1320 - in /packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian: nvidia-glx-ia32.postinst nvidia-glx-legacy-71xx-ia32.postrm nvidia-glx-legacy-71xx-ia32.preinst

[anbe-guest at users.alioth.debian.org]

Author: anbe-guest
Date: Tue Jul  6 07:18:49 2010
New Revision: 1320

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1320
Log:
cleanup ancient /emul/ia32-linux/usr/lib/X11R6/libGL.so* diversions

Modified:
    packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-ia32.postinst
    packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-ia32.postrm
    packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-ia32.preinst

Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-ia32.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-ia32.postinst?rev=1320&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-ia32.postinst (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-ia32.postinst Tue Jul  6 07:18:49 2010
@@ -22,6 +22,22 @@
 		rmdir /emul/ia32-linux/usr/lib/nvidia || true;
 	# </target: squeeze>
 
+	# <target: squeeze>
+	# remove ancient diversions
+	dpkg-divert --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+		/emul/ia32-linux/usr/lib/X11R6/nvidia/libGL.so.ia32-libs \
+		/emul/ia32-linux/usr/lib/X11R6/libGL.so > /dev/null
+	dpkg-divert --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+		/emul/ia32-linux/usr/lib/X11R6/nvidia/libGL.so.1.ia32-libs \
+		/emul/ia32-linux/usr/lib/X11R6/libGL.so.1 > /dev/null
+	dpkg-divert --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+		/emul/ia32-linux/usr/lib/X11R6/nvidia/libGL.so.1.2.ia32-libs \
+		/emul/ia32-linux/usr/lib/X11R6/libGL.so.1.2 > /dev/null
+
+	test -d /emul/ia32-linux/usr/lib/X11R6/nvidia && \
+		rmdir /emul/ia32-linux/usr/lib/X11R6/nvidia || true;
+	# </target: squeeze>
+
     ;;
 esac
 

Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-ia32.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-ia32.postrm?rev=1320&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-ia32.postrm (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-ia32.postrm Tue Jul  6 07:18:49 2010
@@ -19,21 +19,6 @@
 case "$1" in
     remove|purge)
 
-	dpkg-divert --remove --rename --package nvidia-glx-legacy-71xx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/X11R6/nvidia/libGL.so.1.ia32-libs \
-		/emul/ia32-linux/usr/lib/X11R6/libGL.so.1 > /dev/null
-	dpkg-divert --remove --rename --package nvidia-glx-legacy-71xx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/X11R6/nvidia/libGL.so.ia32-libs \
-		/emul/ia32-linux/usr/lib/X11R6/libGL.so > /dev/null
-	dpkg-divert --remove --rename --package nvidia-glx-legacy-71xx-ia32 --divert \
-		/emul/ia32-linux/usr/X11R6/lib/nvidia/libGL.so.1.2.ia32-libs \
-		/emul/ia32-linux/usr/X11R6/lib/libGL.so.1.2 > /dev/null
-
-	test -d /emul/ia32-linux/usr/lib/nvidia && \
-		rmdir /emul/ia32-linux/usr/lib/nvidia || true;
-	test -d /emul/ia32-linux/usr/lib/X11R6/nvidia && \
-		rmdir /emul/ia32-linux/usr/lib/X11R6/nvidia || true;
-
     ;;
     
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-ia32.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-ia32.preinst?rev=1320&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-ia32.preinst (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-ia32.preinst Tue Jul  6 07:18:49 2010
@@ -16,24 +16,6 @@
 case "$1" in
     install|upgrade)
 	
-	# create new diversion directories
-	test -d /emul/ia32-linux/usr/lib/nvidia || \
-		mkdir -p /emul/ia32-linux/usr/lib/nvidia || true
-	test -d /emul/ia32-linux/usr/X11R6/lib/nvidia || \
-		mkdir -p /emul/ia32-linux/usr/X11R6/lib/nvidia || true
-	
-	# make diversions
-	dpkg-divert --add --rename --package nvidia-glx-legacy-71xx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/X11R6/nvidia/libGL.so.1.ia32-libs \
-		/emul/ia32-linux/usr/lib/X11R6/libGL.so.1 > /dev/null
-
-	dpkg-divert --add --rename --package nvidia-glx-legacy-71xx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/X11R6/nvidia/libGL.so.ia32-libs \
-		/emul/ia32-linux/usr/lib/X11R6/libGL.so > /dev/null
-	dpkg-divert --add --rename --package nvidia-glx-legacy-71xx-ia32 --divert \
-		/emul/ia32-linux/usr/X11R6/lib/nvidia/libGL.so.1.2.ia32-libs \
-		/emul/ia32-linux/usr/X11R6/lib/libGL.so.1.2 > /dev/null
-
     ;;
 
     abort-upgrade)