[pkg-nvidia-devel] r528 - in /packages/nvidia-graphics-drivers-legacy-173xx/trunk: debian.binary/control.template debian/nvidia-glx-legacy-173xx.postrm.in debian/nvidia-glx-legacy-173xx.preinst

[rdonald at users.alioth.debian.org]

Author: rdonald
Date: Wed Jan 14 03:29:48 2009
New Revision: 528

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=528
Log:
almost there

Modified:
    packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/control.template
    packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.postrm.in
    packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.preinst

Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/control.template
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/control.template?rev=528&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/control.template (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/control.template Wed Jan 14 03:29:48 2009
@@ -9,6 +9,7 @@
 Architecture: i386 amd64
 Provides: nvidia-kernel-legacy-173xx-#VERSION#
 Depends: nvidia-kernel-common (>= 20051028+1-0.1)
+Conflicts: nvidia-kernel-#VERSION#
 Recommends: linux-image-#KVERS#
 Description: NVIDIA binary kernel module for Linux #KVERS#
  These Xorg binary drivers provide optimized hardware acceleration of 

Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.postrm.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.postrm.in?rev=528&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.postrm.in (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.postrm.in Wed Jan 14 03:29:48 2009
@@ -20,15 +20,15 @@
     remove|purge)
         # remove file created by init script
     	rm /usr/lib/libGL.so || true
-	dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null
-	dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null
+	dpkg-divert --remove --rename --package nvidia-glx-legacy-173xx --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null
+	dpkg-divert --remove --rename --package nvidia-glx-legacy-173xx --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null
 	
-	dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGLcore.a.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.a > /dev/null
-	dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGLcore.so.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.so > /dev/null	
-	dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libglx.a.xlibmesa /usr/lib/xorg/modules/extensions/libglx.a > /dev/null
-	dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libglx.so.xlibmesa /usr/lib/xorg/modules/extensions/libglx.so > /dev/null
+	dpkg-divert --remove --rename --package nvidia-glx-legacy-173xx --divert /usr/lib/nvidia/libGLcore.a.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.a > /dev/null
+	dpkg-divert --remove --rename --package nvidia-glx-legacy-173xx --divert /usr/lib/nvidia/libGLcore.so.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.so > /dev/null	
+	dpkg-divert --remove --rename --package nvidia-glx-legacy-173xx --divert /usr/lib/nvidia/libglx.a.xlibmesa /usr/lib/xorg/modules/extensions/libglx.a > /dev/null
+	dpkg-divert --remove --rename --package nvidia-glx-legacy-173xx --divert /usr/lib/nvidia/libglx.so.xlibmesa /usr/lib/xorg/modules/extensions/libglx.so > /dev/null
 
-	dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
+	dpkg-divert --remove --rename --package nvidia-glx-legacy-173xx --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
 	rm -f /usr/lib/xorg/modules/extensions/libglx.so.#VERSION# 2> /dev/null || true
 	if [ -d /usr/lib/nvidia ]; then
 		rmdir /usr/lib/nvidia/ || true;

Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.preinst?rev=528&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.preinst (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.preinst Wed Jan 14 03:29:48 2009
@@ -85,15 +85,15 @@
 	fi
 
 	# make new diversions
-	dpkg-divert --add --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null
-	dpkg-divert --add --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null
+	dpkg-divert --add --rename --package nvidia-glx-legacy-173xx  --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null
+	dpkg-divert --add --rename --package nvidia-glx-legacy-173xx --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null
 
-	dpkg-divert --add --rename --package nvidia-glx --divert /usr/lib/nvidia/libGLcore.a.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.a > /dev/null
-	dpkg-divert --add --rename --package nvidia-glx --divert /usr/lib/nvidia/libGLcore.so.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.so > /dev/null
-	dpkg-divert --add --rename --package nvidia-glx --divert /usr/lib/nvidia/libglx.a.xlibmesa /usr/lib/xorg/modules/extensions/libglx.a > /dev/null
-	dpkg-divert --add --rename --package nvidia-glx --divert /usr/lib/nvidia/libglx.so.xlibmesa /usr/lib/xorg/modules/extensions/libglx.so > /dev/null	
+	dpkg-divert --add --rename --package nvidia-glx-legacy-173xx --divert /usr/lib/nvidia/libGLcore.a.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.a > /dev/null
+	dpkg-divert --add --rename --package nvidia-glx-legacy-173xx --divert /usr/lib/nvidia/libGLcore.so.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.so > /dev/null
+	dpkg-divert --add --rename --package nvidia-glx-legacy-173xx --divert /usr/lib/nvidia/libglx.a.xlibmesa /usr/lib/xorg/modules/extensions/libglx.a > /dev/null
+	dpkg-divert --add --rename --package nvidia-glx-legacy-173xx --divert /usr/lib/nvidia/libglx.so.xlibmesa /usr/lib/xorg/modules/extensions/libglx.so > /dev/null	
 
-	dpkg-divert --add --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
+	dpkg-divert --add --rename --package nvidia-glx-legacy-173xx --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
 #	dpkg-divert --add --rename --package nvidia-glx --divert /usr/lib/nvidia/libwfb.so.xserver-xorg-core /usr/lib/xorg/modules/libwfb.so > /dev/null
 	;;