[pkg-nvidia-devel] Bug#489389: improved patch for etch

[Frank Loeffler]

I am sorry, the last patch was missing one change which creates a
symlink. For some reason that symlink was present on my test system
anyway, but it should really be created by the package. Here is the
complete patch.

Frank

-------------- next part --------------
diff -ru nvidia-graphics-drivers-173.14.09.orig.orig/debian/nvidia-glx.links.in nvidia-graphics-drivers-173.14.09.orig/debian/nvidia-glx.links.in
--- nvidia-graphics-drivers-173.14.09.orig.orig/debian/nvidia-glx.links.in	2008-07-23 10:48:26.000000000 -0500
+++ nvidia-graphics-drivers-173.14.09.orig/debian/nvidia-glx.links.in	2008-07-23 14:06:49.000000000 -0500
@@ -5,3 +5,4 @@
 usr/lib/libXvMCNVIDIA.so.#VERSION# usr/lib/libXvMCNVIDIA.so.1
 usr/lib/libXvMCNVIDIA.so.#VERSION# usr/lib/libXvMCNVIDIA_dynamic.so.1
 usr/lib/libcuda.so.#VERSION#			usr/lib/libcuda.so
+usr/lib/xorg/modules/libnvidia-wfb.so.#VERSION# usr/lib/xorg/modules/libwfb.so
diff -ru nvidia-graphics-drivers-173.14.09.orig.orig/debian/nvidia-glx.postrm.in nvidia-graphics-drivers-173.14.09.orig/debian/nvidia-glx.postrm.in
--- nvidia-graphics-drivers-173.14.09.orig.orig/debian/nvidia-glx.postrm.in	2008-07-23 10:48:26.000000000 -0500
+++ nvidia-graphics-drivers-173.14.09.orig/debian/nvidia-glx.postrm.in	2008-07-23 14:06:30.000000000 -0500
@@ -29,6 +29,7 @@
 	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 --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
+	dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libwfb.so.xserver-xorg-core /usr/lib/xorg/modules/libwfb.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;
diff -ru nvidia-graphics-drivers-173.14.09.orig.orig/debian/nvidia-glx.preinst nvidia-graphics-drivers-173.14.09.orig/debian/nvidia-glx.preinst
--- nvidia-graphics-drivers-173.14.09.orig.orig/debian/nvidia-glx.preinst	2008-07-23 10:48:26.000000000 -0500
+++ nvidia-graphics-drivers-173.14.09.orig/debian/nvidia-glx.preinst	2008-07-23 14:06:30.000000000 -0500
@@ -94,7 +94,7 @@
 	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 --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
+	dpkg-divert --add --rename --package nvidia-glx --divert /usr/lib/nvidia/libwfb.so.xserver-xorg-core /usr/lib/xorg/modules/libwfb.so > /dev/null
 	;;
 
     abort-upgrade)
diff -ru nvidia-graphics-drivers-173.14.09.orig.orig/debian/rules nvidia-graphics-drivers-173.14.09.orig/debian/rules
--- nvidia-graphics-drivers-173.14.09.orig.orig/debian/rules	2008-07-23 10:48:25.000000000 -0500
+++ nvidia-graphics-drivers-173.14.09.orig/debian/rules	2008-07-23 14:06:30.000000000 -0500
@@ -184,7 +184,7 @@
 
 
 	install $(dirname)/usr/X11R6/lib/modules/extensions/libglx.so.${version} $(CURDIR)/debian/nvidia-glx/usr/lib/xorg/modules/extensions/
-#	install $(dirname)/usr/X11R6/lib/modules/libnvidia-wfb.so.${version} $(CURDIR)/debian/nvidia-glx/usr/lib/xorg/modules/
+	install $(dirname)/usr/X11R6/lib/modules/libnvidia-wfb.so.${version} $(CURDIR)/debian/nvidia-glx/usr/lib/xorg/modules/
 
 	install $(dirname)/usr/bin/tls_test $(CURDIR)/debian/nvidia-glx/usr/lib/nvidia
 	install $(dirname)/usr/bin/tls_test_dso.so $(CURDIR)/debian/nvidia-glx/usr/lib/nvidia