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

[Frank Loeffler]

Hi,

I was bitten by the same problem. I was trying to backport that package
like I did in the past. Maybe nvidia-glx should depend on a version of
xserver-xorg-core, which contains libwfb.so. That would not help in
backporting (on the contrary), but would avaid the late error while
doing so.

Is there no way to support both versions of xserver-xorg-core, like
depending on xerver-xorg-core and depending on its version installing
the lib or not?

On the other hand, I attach a small patch for the current version, which
made it work on etch for me.

Frank

-------------- next part --------------
diff -r -u 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 10:53:40.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 -r -u 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 10:51:27.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 -r -u 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 10:54:24.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