Hi again
I realized that just updating the dependencies are not enough as most
of X is moving to /usr...
This patch works for me, though I have only tested it on i386...
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian/changelog
nvidia-graphics-drivers-1.0.8178/debian/changelog
--- nvidia-graphics-drivers-1.0.8178.orig/debian/changelog 2006-03-07
20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/changelog 2006-03-07
19:38:07.000000000 +0100
@@ -1,3 +1,16 @@
+nvidia-graphics-drivers (1.0.8178-2.0.2) unstable; urgency=low
+
+ * Move stuff from /usr/X11R6 to /usr
+
+ -- Rasmus Bøg Hansen <[EMAIL PROTECTED]> Tue, 7 Mar 2006 19:37:55 +0100
+
+nvidia-graphics-drivers (1.0.8178-2.0.1) unstable; urgency=low
+
+ * Depends updated to fix compatibility with new X.org 7.0 packages in
+ experimental
+
+ -- Rasmus Bøg Hansen <[EMAIL PROTECTED]> Thu, 2 Mar 2006 12:55:46 +0100
+
nvidia-graphics-drivers (1.0.8178-2) unstable; urgency=low
* very belated change of kernel-image to linux-image in Recommends.
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian/control
nvidia-graphics-drivers-1.0.8178/debian/control
--- nvidia-graphics-drivers-1.0.8178.orig/debian/control 2006-03-07
20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/control 2006-03-07
20:15:01.000000000 +0100
@@ -31,7 +31,7 @@
Package: nvidia-glx
Architecture: i386 amd64
-Depends: nvidia-kernel-1.0.8178, xserver-common (>= 4.0.3), ${shlibs:Depends}
+Depends: nvidia-kernel-1.0.8178, x11-common (>= 1:7.0.0), ${shlibs:Depends}
Suggests: nvidia-settings, nvidia-kernel-source (>= 1.0.8178)
Conflicts: nvidia-glx-src
Replaces: nvidia-glx-src
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian/control.in
nvidia-graphics-drivers-1.0.8178/debian/control.in
--- nvidia-graphics-drivers-1.0.8178.orig/debian/control.in 2006-03-07
20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/control.in 2006-03-07
20:14:54.000000000 +0100
@@ -31,7 +31,7 @@
Package: nvidia-glx
Architecture: i386 amd64
-Depends: nvidia-kernel-#VERSION#, xserver-common (>= 4.0.3), ${shlibs:Depends}
+Depends: nvidia-kernel-#VERSION#, x11-common (>= 1:7.0.0), ${shlibs:Depends}
Suggests: nvidia-settings, nvidia-kernel-source (>= #VERSION#)
Conflicts: nvidia-glx-src
Replaces: nvidia-glx-src
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian/copyright
nvidia-graphics-drivers-1.0.8178/debian/copyright
--- nvidia-graphics-drivers-1.0.8178.orig/debian/copyright 2006-03-07
20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/copyright 2006-03-07
20:15:01.000000000 +0100
@@ -2,7 +2,7 @@
Mon, 31 Mar 2003 23:40:05 -0800.
It was downloaded from
-ftp://download.nvidia.com/XFree86/Linux-x86_64/1.0-8178/NVIDIA-Linux-x86_64-1.0-8178-pkg2.run
+ftp://download.nvidia.com/XFree86/Linux-x86/1.0-8178/NVIDIA-Linux-x86-1.0-8178-pkg0.run
Upstream Author: NVIDIA <[EMAIL PROTECTED]>
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx-dev.dirs
nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx-dev.dirs
--- nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx-dev.dirs
2006-03-07 20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx-dev.dirs 2006-03-07
19:39:35.000000000 +0100
@@ -1,3 +1,2 @@
usr/share/nvidia/include/GL
-usr/X11R6/lib/nvidia
usr/lib/nvidia
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx-dev.postrm
nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx-dev.postrm
--- nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx-dev.postrm
2006-03-07 20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx-dev.postrm
2006-03-07 19:42:15.000000000 +0100
@@ -8,32 +8,26 @@
case "$1" in
remove)
dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null
+ dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
# rm /usr/lib/libGL.so || true
# ln -s /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so
-# ln -s /usr/X11R6/lib/nvidia/libGL.so.1.2.xlibmesa
/usr/X11R6/lib/libGL.so
dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null
# dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
# dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
# dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h >
/dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions-X11R6/gl.h /usr/X11R6/include/GL/gl.h >
/dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions-X11R6/glx.h /usr/X11R6/include/GL/glx.h >
/dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions-X11R6/glxtokens.h
/usr/X11R6/include/GL/glxtokens.h > /dev/null
+# dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
+# dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
+# dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h >
/dev/null
if [ -d /usr/lib/nvidia/ ]; then
rmdir /usr/lib/nvidia || true;
fi
- if [ -d /usr/X11R6/lib/nvidia ]; then
- rmdir /usr/X11R6/lib/nvidia || true;
-
- fi
;;
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx-dev.preinst
nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx-dev.preinst
--- nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx-dev.preinst
2006-03-07 20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx-dev.preinst
2006-03-07 20:15:01.000000000 +0100
@@ -19,15 +19,15 @@
fi
- if [ -d /usr/share/nvidia-glx/diversions-X11R6 ] ; then
- rm -f /usr/X11R6/lib/libGL.so
- rm -f /usr/X11R6/lib/libGL.a
+ if [ -d /usr/share/nvidia-glx/diversions ] ; then
+ rm -f /usr/lib/libGL.so
+ rm -f /usr/lib/libGL.a
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions-X11R6/libGL.so /usr/X11R6/lib/libGL.so >
/dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions-X11R6/libGL.a /usr/X11R6/lib/libGL.a >
/dev/null
+ dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/libGL.so /usr/lib/libGL.so > /dev/null
+ dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/libGL.a /usr/lib/libGL.a > /dev/null
- rmdir /usr/share/nvidia-glx/diversions-X11R6/ || true
+ rmdir /usr/share/nvidia-glx/diversions || true
rmdir /usr/share/nvidia-glx || true
fi
@@ -35,13 +35,10 @@
if [ ! -d /usr/lib/nvidia ]; then
mkdir -p /usr/lib/nvidia || true
fi
- if [ ! -d /usr/X11R6/lib/nvidia ]; then
- mkdir -p /usr/X11R6/lib/nvidia || true
- fi
# to remove old old old gl header diversions
- if [ -e /usr/share/nvidia-glx/diversions-X11R6/gl.h ]; then
+ if [ -e /usr/share/nvidia-glx/diversions/gl.h ]; then
if [ -e /usr/include/GL/gl.h ]; then
rm -f /usr/include/GL/gl.h /usr/include/GL/glx.h
/usr/include/GL/glxtokens.h
fi
@@ -49,32 +46,30 @@
dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/glxext.h /usr/include/GL/glxext.h > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions-X11R6/gl.h /usr/X11R6/include/GL/gl.h >
/dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions-X11R6/glx.h /usr/X11R6/include/GL/glx.h >
/dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions-X11R6/glxext.h /usr/X11R6/include/GL/glxext.h
> /dev/null
+ dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
+ dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
+ dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/glxext.h /usr/include/GL/glxext.h > /dev/null
fi
dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
- dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null
-# rm /usr/lib/libGL.so || true
-# rm /usr/X11R6/lib/libGL.so || true
+ dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
+# rm /usr/lib/libGL.so || true
# ln -s /usr/lib/libGL.so.1.0.8178 /usr/lib/libGL.so || true
dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null
- dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null
# dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
# dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
# dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h >
/dev/null
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions-X11R6/gl.h /usr/X11R6/include/GL/gl.h >
/dev/null
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions-X11R6/glx.h /usr/X11R6/include/GL/glx.h >
/dev/null
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions-X11R6/glxtokens.h
/usr/X11R6/include/GL/glxtokens.h > /dev/null
+# dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
+# dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
+# dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h >
/dev/null
;;
diff -urN
nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx-dev.preinst.in
nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx-dev.preinst.in
--- nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx-dev.preinst.in
2006-03-07 20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx-dev.preinst.in
2006-03-07 19:42:42.000000000 +0100
@@ -19,15 +19,15 @@
fi
- if [ -d /usr/share/nvidia-glx/diversions-X11R6 ] ; then
- rm -f /usr/X11R6/lib/libGL.so
- rm -f /usr/X11R6/lib/libGL.a
+ if [ -d /usr/share/nvidia-glx/diversions ] ; then
+ rm -f /usr/lib/libGL.so
+ rm -f /usr/lib/libGL.a
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions-X11R6/libGL.so /usr/X11R6/lib/libGL.so >
/dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions-X11R6/libGL.a /usr/X11R6/lib/libGL.a >
/dev/null
+ dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/libGL.so /usr/lib/libGL.so > /dev/null
+ dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/libGL.a /usr/lib/libGL.a > /dev/null
- rmdir /usr/share/nvidia-glx/diversions-X11R6/ || true
+ rmdir /usr/share/nvidia-glx/diversions || true
rmdir /usr/share/nvidia-glx || true
fi
@@ -35,13 +35,10 @@
if [ ! -d /usr/lib/nvidia ]; then
mkdir -p /usr/lib/nvidia || true
fi
- if [ ! -d /usr/X11R6/lib/nvidia ]; then
- mkdir -p /usr/X11R6/lib/nvidia || true
- fi
# to remove old old old gl header diversions
- if [ -e /usr/share/nvidia-glx/diversions-X11R6/gl.h ]; then
+ if [ -e /usr/share/nvidia-glx/diversions/gl.h ]; then
if [ -e /usr/include/GL/gl.h ]; then
rm -f /usr/include/GL/gl.h /usr/include/GL/glx.h
/usr/include/GL/glxtokens.h
fi
@@ -49,32 +46,30 @@
dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/glxext.h /usr/include/GL/glxext.h > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions-X11R6/gl.h /usr/X11R6/include/GL/gl.h >
/dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions-X11R6/glx.h /usr/X11R6/include/GL/glx.h >
/dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions-X11R6/glxext.h /usr/X11R6/include/GL/glxext.h
> /dev/null
+ dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
+ dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
+ dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/glxext.h /usr/include/GL/glxext.h > /dev/null
fi
dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
- dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null
-# rm /usr/lib/libGL.so || true
-# rm /usr/X11R6/lib/libGL.so || true
+ dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
+# rm /usr/lib/libGL.so || true
# ln -s /usr/lib/libGL.so.#VERSION# /usr/lib/libGL.so || true
dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null
- dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null
# dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
# dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
# dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h >
/dev/null
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions-X11R6/gl.h /usr/X11R6/include/GL/gl.h >
/dev/null
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions-X11R6/glx.h /usr/X11R6/include/GL/glx.h >
/dev/null
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions-X11R6/glxtokens.h
/usr/X11R6/include/GL/glxtokens.h > /dev/null
+# dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
+# dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
+# dpkg-divert --add --rename --package nvidia-glx-dev --divert
/usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h >
/dev/null
;;
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx.dirs
nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx.dirs
--- nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx.dirs
2006-03-07 20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx.dirs 2006-03-07
19:42:51.000000000 +0100
@@ -1,8 +1,8 @@
usr/bin
usr/lib
usr/share/lintian/overrides
-usr/X11R6/lib/modules/drivers
-usr/X11R6/lib/modules/extensions
+usr/lib/xorg/modules/drivers
+usr/lib/xorg/modules/extensions
usr/lib/tls
usr/lib/nvidia
usr/share/bug/nvidia-glx
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx.docs
nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx.docs
--- nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx.docs
2006-03-07 20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx.docs 2006-03-07
20:15:01.000000000 +0100
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-1.0-8178-pkg2/usr/share/doc/NVIDIA_Changelog
-NVIDIA-Linux-x86_64-1.0-8178-pkg2/usr/share/doc/README.txt
+NVIDIA-Linux-x86-1.0-8178-pkg0/usr/share/doc/NVIDIA_Changelog
+NVIDIA-Linux-x86-1.0-8178-pkg0/usr/share/doc/README.txt
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx.examples
nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx.examples
--- nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx.examples
2006-03-07 20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx.examples 2006-03-07
20:15:01.000000000 +0100
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-1.0-8178-pkg2/usr/share/doc/XF86Config.sample
+NVIDIA-Linux-x86-1.0-8178-pkg0/usr/share/doc/XF86Config.sample
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx-ia32.postrm
nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx-ia32.postrm
--- nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx-ia32.postrm
2006-03-07 20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx-ia32.postrm
2006-03-07 19:46:40.000000000 +0100
@@ -27,16 +27,14 @@
/emul/ia32-linux/usr/lib/libGL.so.1.2 > /dev/null
dpkg-divert --remove --rename --package nvidia-glx-ia32 --divert \
- /emul/ia32-linux/usr/lib/X11R6/nvidia/libGL.so.1.ia32-libs \
- /emul/ia32-linux/usr/lib/X11R6/libGL.so.1 > /dev/null
+ /emul/ia32-linux/usr/lib/nvidia/libGL.so.1.ia32-libs \
+ /emul/ia32-linux/usr/lib/libGL.so.1 > /dev/null
dpkg-divert --remove --rename --package nvidia-glx-ia32 --divert \
- /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
+ /emul/ia32-linux/usr/lib/nvidia/libGL.so.1.2.ia32-libs \
+ /emul/ia32-linux/usr/lib/libGL.so.1.2 > /dev/null
test -d /emul/ia32-linux/usr/lib/nvidia && \
rmdir /emul/ia32-linux/usr/lib/nvidia || true;
- test -d /emul/ia32-linux/usr/lib/X11R6/nvidia && \
- rmdir /emul/ia32-linux/usr/lib/X11R6/nvidia || true;
ldconfig
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx-ia32.preinst
nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx-ia32.preinst
--- nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx-ia32.preinst
2006-03-07 20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx-ia32.preinst
2006-03-07 19:47:12.000000000 +0100
@@ -19,8 +19,6 @@
# create new diversion directories
test -d /emul/ia32-linux/usr/lib/nvidia || \
mkdir -p /emul/ia32-linux/usr/lib/nvidia || true
- test -d /emul/ia32-linux/usr/X11R6/lib/nvidia || \
- mkdir -p /emul/ia32-linux/usr/X11R6/lib/nvidia || true
# make diversions
dpkg-divert --add --rename --package nvidia-glx-ia32 --divert \
@@ -31,11 +29,11 @@
/emul/ia32-linux/usr/lib/libGL.so.1.2 > /dev/null
dpkg-divert --add --rename --package nvidia-glx-ia32 --divert \
- /emul/ia32-linux/usr/lib/X11R6/nvidia/libGL.so.1.ia32-libs \
- /emul/ia32-linux/usr/lib/X11R6/libGL.so.1 > /dev/null
+ /emul/ia32-linux/usr/lib/nvidia/libGL.so.1.ia32-libs \
+ /emul/ia32-linux/usr/lib/libGL.so.1 > /dev/null
dpkg-divert --add --rename --package nvidia-glx-ia32 --divert \
- /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
+ /emul/ia32-linux/usr/lib/nvidia/libGL.so.1.2.ia32-libs \
+ /emul/ia32-linux/usr/lib/libGL.so.1.2 > /dev/null
;;
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx.links
nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx.links
--- nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx.links
2006-03-07 20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx.links 2006-03-07
20:15:01.000000000 +0100
@@ -1,7 +1,7 @@
usr/lib/libGL.so.1.0.8178 usr/lib/libGL.so.1
usr/lib/libGLcore.so.1.0.8178 usr/lib/libGLcore.so.1
usr/lib/libnvidia-tls.so.1.0.8178 usr/lib/libnvidia-tls.so.1
-usr/X11R6/lib/modules/extensions/libglx.so.1.0.8178
usr/X11R6/lib/modules/extensions/libglx.so
-usr/X11R6/lib/libXvMCNVIDIA.so.1.0.8178 usr/X11R6/lib/libXvMCNVIDIA.so.1
-usr/X11R6/lib/libXvMCNVIDIA.so.1.0.8178
usr/X11R6/lib/libXvMCNVIDIA_dynamic.so.1
+usr/lib/xorg/modules/extensions/libglx.so.1.0.8178
usr/lib/xorg/modules/extensions/libglx.so
+usr/lib/libXvMCNVIDIA.so.1.0.8178 usr/lib/libXvMCNVIDIA.so.1
+usr/lib/libXvMCNVIDIA.so.1.0.8178 usr/lib/libXvMCNVIDIA_dynamic.so.1
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx.links.in
nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx.links.in
--- nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx.links.in
2006-03-07 20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx.links.in 2006-03-02
13:57:19.000000000 +0100
@@ -1,7 +1,7 @@
usr/lib/libGL.so.#VERSION# usr/lib/libGL.so.1
usr/lib/libGLcore.so.#VERSION# usr/lib/libGLcore.so.1
usr/lib/libnvidia-tls.so.#VERSION# usr/lib/libnvidia-tls.so.1
-usr/X11R6/lib/modules/extensions/libglx.so.#VERSION#
usr/X11R6/lib/modules/extensions/libglx.so
-usr/X11R6/lib/libXvMCNVIDIA.so.#VERSION# usr/X11R6/lib/libXvMCNVIDIA.so.1
-usr/X11R6/lib/libXvMCNVIDIA.so.#VERSION#
usr/X11R6/lib/libXvMCNVIDIA_dynamic.so.1
+usr/lib/xorg/modules/extensions/libglx.so.#VERSION#
usr/lib/xorg/modules/extensions/libglx.so
+usr/lib/libXvMCNVIDIA.so.#VERSION# usr/lib/libXvMCNVIDIA.so.1
+usr/lib/libXvMCNVIDIA.so.#VERSION# usr/lib/libXvMCNVIDIA_dynamic.so.1
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx.override
nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx.override
--- nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx.override
2006-03-07 20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx.override 2006-03-07
20:15:01.000000000 +0100
@@ -2,13 +2,13 @@
nvidia-glx: shared-lib-without-dependency-information
./usr/lib/libGLcore.so.1.0.8178
-nvidia-glx: library-not-linked-against-libc
./usr/X11R6/lib/modules/extensions/libglx.so.1.0.8178
+nvidia-glx: library-not-linked-against-libc
./usr/lib/xorg/modules/extensions/libglx.so.1.0.8178
nvidia-glx: shlib-with-non-pic-code usr/lib/libGL.so.1.0.8178
nvidia-glx: shlib-with-non-pic-code usr/lib/libGLcore.so.1.0.8178
-nvidia-glx: shlib-with-non-pic-code
usr/X11R6/lib/modules/extensions/libglx.so.1.0.8178
-nvidia-glx: shlib-with-non-pic-code usr/X11R6/lib/libXvMCNVIDIA.so.1.0.8178
-nvidia-glx: shlib-with-non-pic-code usr/X11R6/lib/libXvMCNVIDIA.so.1.0.8178
+nvidia-glx: shlib-with-non-pic-code
usr/lib/xorg/modules/extensions/libglx.so.1.0.8178
+nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/libXvMCNVIDIA.so.1.0.8178
+nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/libXvMCNVIDIA.so.1.0.8178
nvidia-glx: non-dev-pkg-with-shlib-symlink usr/lib/libGL.so.1.0.8178
usr/lib/libGL.so
-nvidia-glx: non-dev-pkg-with-shlib-symlink
usr/X11R6/lib/modules/extensions/libglx.so.1.0.8178
usr/X11R6/lib/modules/extensions/libglx.so
+nvidia-glx: non-dev-pkg-with-shlib-symlink
usr/lib/xorg/modules/extensions/libglx.so.1.0.8178
usr/lib/xorg/modules/extensions/libglx.so
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx.override.in
nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx.override.in
--- nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx.override.in
2006-03-07 20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx.override.in
2006-03-02 14:02:00.000000000 +0100
@@ -2,13 +2,13 @@
nvidia-glx: shared-lib-without-dependency-information
./usr/lib/libGLcore.so.#VERSION#
-nvidia-glx: library-not-linked-against-libc
./usr/X11R6/lib/modules/extensions/libglx.so.#VERSION#
+nvidia-glx: library-not-linked-against-libc
./usr/lib/xorg/modules/extensions/libglx.so.#VERSION#
nvidia-glx: shlib-with-non-pic-code usr/lib/libGL.so.#VERSION#
nvidia-glx: shlib-with-non-pic-code usr/lib/libGLcore.so.#VERSION#
-nvidia-glx: shlib-with-non-pic-code
usr/X11R6/lib/modules/extensions/libglx.so.#VERSION#
-nvidia-glx: shlib-with-non-pic-code usr/X11R6/lib/libXvMCNVIDIA.so.#VERSION#
-nvidia-glx: shlib-with-non-pic-code usr/X11R6/lib/libXvMCNVIDIA.so.#VERSION#
+nvidia-glx: shlib-with-non-pic-code
usr/lib/xorg/modules/extensions/libglx.so.#VERSION#
+nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/libXvMCNVIDIA.so.#VERSION#
+nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/libXvMCNVIDIA.so.#VERSION#
nvidia-glx: non-dev-pkg-with-shlib-symlink usr/lib/libGL.so.#VERSION#
usr/lib/libGL.so
-nvidia-glx: non-dev-pkg-with-shlib-symlink
usr/X11R6/lib/modules/extensions/libglx.so.#VERSION#
usr/X11R6/lib/modules/extensions/libglx.so
+nvidia-glx: non-dev-pkg-with-shlib-symlink
usr/lib/xorg/modules/extensions/libglx.so.#VERSION#
usr/lib/xorg/modules/extensions/libglx.so
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx.postrm
nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx.postrm
--- nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx.postrm
2006-03-07 20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx.postrm 2006-03-07
20:15:01.000000000 +0100
@@ -22,22 +22,18 @@
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 --divert
/usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/X11R6/lib/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/X11R6/lib/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 >
/dev/null
-# dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null
+ 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 --divert
/usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/X11R6/lib/nvidia/libGLcore.a.xlibmesa
/usr/X11R6/lib/modules/extensions/libGLcore.a > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/X11R6/lib/nvidia/libglx.a.xlibmesa
/usr/X11R6/lib/modules/extensions/libglx.a > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/X11R6/lib/nvidia/libglx.so.xlibmesa
/usr/X11R6/lib/modules/extensions/libglx.so > /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/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
- rm -f /usr/X11R6/lib/modules/extensions/libglx.so.1.0.8178 2> /dev/null
|| true
+ rm -f /usr/lib/xorg/modules/extensions/libglx.so.1.0.8178 2> /dev/null
|| true
if [ -d /usr/lib/nvidia ]; then
rmdir /usr/lib/nvidia/ || true;
fi
- if [ -d /usr/X11R6/lib/nvidia ]; then
- rmdir /usr/X11R6/lib/nvidia || true;
-
- fi
ldconfig
;;
@@ -54,7 +50,7 @@
esac
-#rm -f /usr/X11R6/lib/modules/extensions/libglx.so.1.0.8178 2> /dev/null ||
true
+#rm -f /usr/lib/xorg/modules/extensions/libglx.so.1.0.8178 2> /dev/null || true
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx.postrm.in
nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx.postrm.in
--- nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx.postrm.in
2006-03-07 20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx.postrm.in
2006-03-07 19:37:27.000000000 +0100
@@ -22,22 +22,18 @@
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 --divert
/usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/X11R6/lib/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/X11R6/lib/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 >
/dev/null
-# dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null
+ 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 --divert
/usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/X11R6/lib/nvidia/libGLcore.a.xlibmesa
/usr/X11R6/lib/modules/extensions/libGLcore.a > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/X11R6/lib/nvidia/libglx.a.xlibmesa
/usr/X11R6/lib/modules/extensions/libglx.a > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/X11R6/lib/nvidia/libglx.so.xlibmesa
/usr/X11R6/lib/modules/extensions/libglx.so > /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/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
- rm -f /usr/X11R6/lib/modules/extensions/libglx.so.#VERSION# 2>
/dev/null || true
+ 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;
fi
- if [ -d /usr/X11R6/lib/nvidia ]; then
- rmdir /usr/X11R6/lib/nvidia || true;
-
- fi
ldconfig
;;
@@ -54,7 +50,7 @@
esac
-#rm -f /usr/X11R6/lib/modules/extensions/libglx.so.#VERSION# 2> /dev/null ||
true
+#rm -f /usr/lib/xorg/modules/extensions/libglx.so.#VERSION# 2> /dev/null ||
true
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx.preinst
nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx.preinst
--- nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-glx.preinst
2006-03-07 20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/nvidia-glx.preinst 2006-03-07
19:49:20.000000000 +0100
@@ -28,23 +28,23 @@
dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/share/nvidia-glx/diversions/libGL.so.1 /usr/lib/libGL.so.1 > /dev/null
dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/share/nvidia-glx/diversions/libGL.so.1.2 /usr/lib/libGL.so.1.2 > /dev/null
- rm -f /usr/X11R6/lib/modules/extensions/libGLcore.a
- rm -f /usr/X11R6/lib/modules/extensions/libglx.a
- dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/share/nvidia-glx/diversions/libGLcore.a
/usr/X11R6/lib/modules/extensions/libGLcore.a > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/share/nvidia-glx/diversions/libglx.a
/usr/X11R6/lib/modules/extensions/libglx.a > /dev/null
+ rm -f /usr/lib/xorg/modules/extensions/libGLcore.a
+ rm -f /usr/lib/xorg/modules/extensions/libglx.a
+ dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/share/nvidia-glx/diversions/libGLcore.a
/usr/lib/xorg/modules/extensions/libGLcore.a > /dev/null
+ dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/share/nvidia-glx/diversions/libglx.a
/usr/lib/xorg/modules/extensions/libglx.a > /dev/null
rmdir /usr/share/nvidia-glx/diversions || true;
rmdir /usr/share/nvidia-glx || true;
fi
- if [ -d /usr/share/nvidia-glx/diversions-X11R6 ]; then
+ if [ -d /usr/share/nvidia-glx/diversions ]; then
- rm -f /usr/X11R6/lib/libGL.so.1
- rm -f /usr/X11R6/lib/libGL.so.1.2
+ rm -f /usr/lib/libGL.so.1
+ rm -f /usr/lib/libGL.so.1.2
- dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/share/nvidia-glx/diversions-X11R6/libGL.so.1 /usr/X11R6/lib/libGL.so.1 >
/dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/share/nvidia-glx/diversions-X11R6/libGL.so.1.2 /usr/X11R6/lib/libGL.so.1.2
> /dev/null
+ dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/share/nvidia-glx/diversions/libGL.so.1 /usr/lib/libGL.so.1 > /dev/null
+ dpkg-divert --remove --rename --package nvidia-glx --divert
/usr/share/nvidia-glx/diversions/libGL.so.1.2 /usr/lib/libGL.so.1.2 > /dev/null
- rmdir /usr/share/nvidia-glx/diversions-X11R6 || true;
+ rmdir /usr/share/nvidia-glx/diversions || true;
rmdir /usr/share/nvidia-glx || true;
fi
@@ -53,13 +53,10 @@
if [ ! -d /usr/lib/nvidia ]; then
mkdir -p /usr/lib/nvidia || true
fi
- if [ ! -d /usr/X11R6/lib/nvidia ]; then
- mkdir -p /usr/X11R6/lib/nvidia || true
- fi
# remove old diversion from nvidia-glx-dev of libGL.so
# dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null || true
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null ||
true
+# dpkg-divert --remove --rename --package nvidia-glx-dev --divert
/usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null || true
@@ -68,13 +65,13 @@
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 --divert
/usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
- dpkg-divert --add --rename --package nvidia-glx --divert
/usr/X11R6/lib/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null
- dpkg-divert --add --rename --package nvidia-glx --divert
/usr/X11R6/lib/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 >
/dev/null
-# dpkg-divert --add --rename --package nvidia-glx --divert
/usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null
+ 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 --divert
/usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
- dpkg-divert --add --rename --package nvidia-glx --divert
/usr/X11R6/lib/nvidia/libGLcore.a.xlibmesa
/usr/X11R6/lib/modules/extensions/libGLcore.a > /dev/null
- dpkg-divert --add --rename --package nvidia-glx --divert
/usr/X11R6/lib/nvidia/libglx.a.xlibmesa
/usr/X11R6/lib/modules/extensions/libglx.a > /dev/null
- dpkg-divert --add --rename --package nvidia-glx --divert
/usr/X11R6/lib/nvidia/libglx.so.xlibmesa
/usr/X11R6/lib/modules/extensions/libglx.so > /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/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
;;
abort-upgrade)
diff -urN
nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-kernel-source.docs
nvidia-graphics-drivers-1.0.8178/debian/nvidia-kernel-source.docs
--- nvidia-graphics-drivers-1.0.8178.orig/debian/nvidia-kernel-source.docs
2006-03-07 20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/nvidia-kernel-source.docs
2006-03-07 20:15:01.000000000 +0100
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-1.0-8178-pkg2/usr/share/doc/NVIDIA_Changelog
-NVIDIA-Linux-x86_64-1.0-8178-pkg2/usr/share/doc/README.txt
+NVIDIA-Linux-x86-1.0-8178-pkg0/usr/share/doc/NVIDIA_Changelog
+NVIDIA-Linux-x86-1.0-8178-pkg0/usr/share/doc/README.txt
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian/rules
nvidia-graphics-drivers-1.0.8178/debian/rules
--- nvidia-graphics-drivers-1.0.8178.orig/debian/rules 2006-03-07
20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian/rules 2006-03-07
19:33:36.000000000 +0100
@@ -128,12 +128,12 @@
install -m 0644 $(dirname)/usr/X11R6/lib/modules/drivers/nvidia_drv.o \
- $(CURDIR)/debian/nvidia-glx/usr/X11R6/lib/modules/drivers
+ $(CURDIR)/debian/nvidia-glx/usr/lib/xorg/modules/drivers
- install $(dirname)/usr/X11R6/lib/libXvMCNVIDIA.a
$(CURDIR)/debian/nvidia-glx-dev/usr/X11R6/lib/libXvMCNVIDIA.a;
- install $(dirname)/usr/X11R6/lib/libXvMCNVIDIA.so.${version}
$(CURDIR)/debian/nvidia-glx/usr/X11R6/lib/libXvMCNVIDIA.so.${version};
+ install $(dirname)/usr/X11R6/lib/libXvMCNVIDIA.a
$(CURDIR)/debian/nvidia-glx-dev/usr/lib/libXvMCNVIDIA.a;
+ install $(dirname)/usr/X11R6/lib/libXvMCNVIDIA.so.${version}
$(CURDIR)/debian/nvidia-glx/usr/lib/libXvMCNVIDIA.so.${version};
@@ -164,7 +164,7 @@
# install -m 0644 $(dirname)/usr/lib/tls/libGL.la
$(CURDIR)/debian/nvidia-glx/usr/lib/nvidia/libGL.la
- install
$(dirname)/usr/X11R6/lib/modules/extensions/libglx.so.${version}
$(CURDIR)/debian/nvidia-glx/usr/X11R6/lib/modules/extensions/
+ install
$(dirname)/usr/X11R6/lib/modules/extensions/libglx.so.${version}
$(CURDIR)/debian/nvidia-glx/usr/lib/xorg/modules/extensions/
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
diff -urN nvidia-graphics-drivers-1.0.8178.orig/debian.binary/changelog
nvidia-graphics-drivers-1.0.8178/debian.binary/changelog
--- nvidia-graphics-drivers-1.0.8178.orig/debian.binary/changelog
2006-03-07 20:18:07.000000000 +0100
+++ nvidia-graphics-drivers-1.0.8178/debian.binary/changelog 2006-03-07
20:15:02.000000000 +0100
@@ -1,3 +1,22 @@
+nvidia-kernel (1.0.8178-2.0.2) unstable; urgency=low
+
+ * Move stuff from /usr/X11R6 to /usr
+
+ -- Rasmus Bøg Hansen <[EMAIL PROTECTED]> Tue, 7 Mar 2006 19:37:55 +0100
+
+nvidia-kernel (1.0.8178-2.0.1) unstable; urgency=low
+
+ * Depends updated to fix compatibility with new X.org 7.0 packages in
+ experimental
+
+ -- Rasmus Bøg Hansen <[EMAIL PROTECTED]> Thu, 2 Mar 2006 12:55:46 +0100
+
+nvidia-kernel (1.0.8178-2) unstable; urgency=low
+
+ * very belated change of kernel-image to linux-image in Recommends.
+
+ -- Randall Donald <[EMAIL PROTECTED]> Mon, 13 Feb 2006 20:26:15 -0800
+
nvidia-kernel (1.0.8178-1) unstable; urgency=low
* Upload to archive.
It will almost not certainly not work for Xorg 6.9 or earlier.
Feel free to use it if it is worth anything - or to discard it if it
isn't :-)
Regards
/Rasmus
--
-- [ Rasmus "Møffe" Bøg Hansen ] ---------------------------------------
When participating in sporting events, it´s not whether you win or lose.
It´s how drunk you get.
- Homer Simpson
----------------------------------------------[ moffe at zz9 dot dk ] --
