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

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

Author: anbe-guest
Date: Wed Jul  7 09:10:14 2010
New Revision: 1339

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1339
Log:
merge libgl1-nvidia-dev.postinst into nvidia-glx.postinst

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

Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postinst?rev=1339&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postinst (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postinst Wed Jul  7 09:10:14 2010
@@ -45,6 +45,12 @@
 		undivert /usr/lib/xorg/modules/extensions/libGLcore.so	/usr/lib/nvidia/libGLcore.so.xlibmesa
 		undivert /usr/lib/xorg/modules/extensions/libGLcore.a	/usr/lib/nvidia/libGLcore.a.xlibmesa
 		undivert /usr/lib/xorg/modules/extensions/libglx.a	/usr/lib/nvidia/libglx.a.xlibmesa
+
+		# remove obsolete diversions from nvidia-glx-legacy{,-71xx}-dev
+		undivert /usr/lib/libGL.a				/usr/lib/nvidia/libGL.a.xlibmesa
+		undivert /usr/X11R6/lib/libGL.a				/usr/X11R6/lib/nvidia/libGL.a.xlibmesa
+
+		rmdir /usr/lib/nvidia /usr/X11R6/lib/nvidia /usr/X11R6/lib /usr/X11R6 2>/dev/null || true
         fi
         # </target: squeeze>