[pkg-nvidia-devel] r1333 - in /packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian: libgl1-nvidia-dev.postinst nvidia-glx-ia32.postinst

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

Author: anbe-guest
Date: Tue Jul  6 11:12:43 2010
New Revision: 1333

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1333
Log:
cleanup the correct diversions

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

Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-dev.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-dev.postinst?rev=1333&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-dev.postinst (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-dev.postinst Tue Jul  6 11:12:43 2010
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-if [ "$1" = "configure" ]
+if [ "$1" = "configure" ] && [ "$2" = "" ]
 then
 
         # <target: squeeze>
@@ -9,7 +9,7 @@
 	dpkg-divert --remove --rename --package nvidia-glx-legacy-71xx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa  /usr/lib/libGL.a > /dev/null
 	dpkg-divert --remove --rename --package nvidia-glx-legacy-71xx-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null
 
-	rmdir /usr/lib/nvidia /usr/X11R6/lib/nvidia 2>/dev/null || true
+	rmdir /usr/lib/nvidia /usr/X11R6/lib/nvidia /usr/X11R6/lib /usr/X11R6 2>/dev/null || true
         # </target: squeeze>
 
 fi

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=1333&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 11:12:43 2010
@@ -31,11 +31,11 @@
 		/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
+		/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/X11R6/nvidia && \
-		rmdir /emul/ia32-linux/usr/lib/X11R6/nvidia || true;
+	rmdir /emul/ia32-linux/usr/lib/X11R6/nvidia /emul/ia32-linux/usr/lib/X11R6 2>/dev/null || true
+	rmdir /emul/ia32-linux/usr/X11R6/lib/nvidia /emul/ia32-linux/usr/X11R6/lib /emul/ia32-linux/usr/X11R6 2>/dev/null || true
 	# </target: squeeze>
 
     ;;