Package: nvidia-glx Version: 1.0.8756-1 Followup-For: Bug #354961 The attached patch allows 1.0.8756-1 to be used with modular X.org 7.0. It seems to work for me.
Feel free to use - and push me on the stomach if something doesn't work.
diff -urN ../n2/nvidia-graphics-drivers-1.0.8756/debian/changelog nvidia-graphics-drivers-1.0.8756/debian/changelog --- ../n2/nvidia-graphics-drivers-1.0.8756/debian/changelog 2006-04-10 08:56:33.000000000 +0200 +++ nvidia-graphics-drivers-1.0.8756/debian/changelog 2006-04-10 08:59:25.000000000 +0200 @@ -1,3 +1,9 @@ +nvidia-graphics-drivers (1.0.8756-1.0.1) unstable; urgency=low + + * Adjust for X.org 7.0 + + -- Rasmus Bøg Hansen <[EMAIL PROTECTED]> Mon, 10 Apr 2006 08:59:10 +0200 + nvidia-graphics-drivers (1.0.8756-1) unstable; urgency=low * New upstream (closes: #361352) diff -urN ../n2/nvidia-graphics-drivers-1.0.8756/debian/control.in nvidia-graphics-drivers-1.0.8756/debian/control.in --- ../n2/nvidia-graphics-drivers-1.0.8756/debian/control.in 2006-04-10 08:56:33.000000000 +0200 +++ nvidia-graphics-drivers-1.0.8756/debian/control.in 2006-04-10 08:50:58.000000000 +0200 @@ -31,9 +31,10 @@ 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 +Provides: xserver-xorg-video Replaces: nvidia-glx-src Description: NVIDIA binary XFree86 4.x driver These XFree86 4.0 / Xorg binary drivers provide optimized hardware diff -urN ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-dev.dirs nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-dev.dirs --- ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-dev.dirs 2006-04-10 08:56:33.000000000 +0200 +++ nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-dev.dirs 2006-04-10 08:47:26.000000000 +0200 @@ -1,3 +1,2 @@ usr/include/GL -usr/X11R6/lib/nvidia usr/lib/nvidia diff -urN ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-dev.postrm nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-dev.postrm --- ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-dev.postrm 2006-04-10 08:56:33.000000000 +0200 +++ nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-dev.postrm 2006-04-10 08:47:26.000000000 +0200 @@ -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 ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-dev.preinst nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-dev.preinst --- ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-dev.preinst 2006-04-10 08:56:33.000000000 +0200 +++ nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-dev.preinst 2006-04-10 08:53:10.000000000 +0200 @@ -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,16 +46,15 @@ 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 @@ -66,15 +62,14 @@ 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 ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-dev.preinst.in nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-dev.preinst.in --- ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-dev.preinst.in 2006-04-10 08:56:33.000000000 +0200 +++ nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-dev.preinst.in 2006-04-10 08:47:26.000000000 +0200 @@ -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 ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx.dirs nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx.dirs --- ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx.dirs 2006-04-10 08:56:33.000000000 +0200 +++ nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx.dirs 2006-04-10 08:47:26.000000000 +0200 @@ -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 ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-ia32.postrm nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-ia32.postrm --- ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-ia32.postrm 2006-04-10 08:56:33.000000000 +0200 +++ nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-ia32.postrm 2006-04-10 08:47:26.000000000 +0200 @@ -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 ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-ia32.preinst nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-ia32.preinst --- ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-ia32.preinst 2006-04-10 08:56:33.000000000 +0200 +++ nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx-ia32.preinst 2006-04-10 08:47:26.000000000 +0200 @@ -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 ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx.links.in nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx.links.in --- ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx.links.in 2006-04-10 08:56:33.000000000 +0200 +++ nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx.links.in 2006-04-10 08:47:26.000000000 +0200 @@ -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 ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx.override.in nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx.override.in --- ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx.override.in 2006-04-10 08:56:33.000000000 +0200 +++ nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx.override.in 2006-04-10 08:47:26.000000000 +0200 @@ -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 ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx.postrm.in nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx.postrm.in --- ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx.postrm.in 2006-04-10 08:56:33.000000000 +0200 +++ nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx.postrm.in 2006-04-10 08:47:26.000000000 +0200 @@ -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 ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx.preinst nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx.preinst --- ../n2/nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx.preinst 2006-04-10 08:56:33.000000000 +0200 +++ nvidia-graphics-drivers-1.0.8756/debian/nvidia-glx.preinst 2006-04-10 08:47:26.000000000 +0200 @@ -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 ../n2/nvidia-graphics-drivers-1.0.8756/debian/rules nvidia-graphics-drivers-1.0.8756/debian/rules --- ../n2/nvidia-graphics-drivers-1.0.8756/debian/rules 2006-04-10 08:56:33.000000000 +0200 +++ nvidia-graphics-drivers-1.0.8756/debian/rules 2006-04-10 08:47:26.000000000 +0200 @@ -129,12 +129,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}; @@ -167,7 +167,7 @@ install -m 0644 $(dirname)/usr/lib/libnvidia-cfg.so.${version} $(CURDIR)/debian/nvidia-glx/usr/lib/nvidia/ - 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 ../n2/nvidia-graphics-drivers-1.0.8756/debian.binary/changelog.orig nvidia-graphics-drivers-1.0.8756/debian.binary/changelog.orig --- ../n2/nvidia-graphics-drivers-1.0.8756/debian.binary/changelog.orig 1970-01-01 01:00:00.000000000 +0100 +++ nvidia-graphics-drivers-1.0.8756/debian.binary/changelog.orig 2006-04-10 08:44:27.000000000 +0200 @@ -0,0 +1,526 @@ +nvidia-kernel (1.0.8756-1) unstable; urgency=low + + * New upstream (closes: #361352) + * Please don't file wishlist bugs after only a few hours. + * nvdia-glx-dev: put headers under /usr/include and conflict + with other libgl-dev + * nvidia-glx-dev: stricter depends on nvidia-glx (closes: #335539) + * nvidia-glx: include libnvidia-cfg (closes: #356800) + * lower debhelper level back to sarge ver. 4 level (closes: #356775) + + -- Randall Donald <[EMAIL PROTECTED]> Fri, 7 Apr 2006 18:55:06 -0700 + +nvidia-kernel (1.0.8178-3) unstable; urgency=low + + * upload fix for 2.6.16 (closes: #357992, #346355) + + -- Randall Donald <[EMAIL PROTECTED]> Tue, 28 Mar 2006 19:48:59 -0800 + +nvidia-kernel (1.0.8178-2.1) unstable; urgency=low + + * add new upstream patch NVIDIA_kernel-1.0-8178-U012206.diff.txt, + closes #357992 + + -- Harald Dunkel <[EMAIL PROTECTED]> Fri, 24 Mar 2006 06:51:49 +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. + + -- Randall Donald <[EMAIL PROTECTED]> Tue, 27 Dec 2005 13:46:44 -0800 + +nvidia-kernel (1.0.8178-0.1) unstable; urgency=low + + * patch scheme added + * applied NVidia's patch NVIDIA_kernel-1.0-8178-U122205 + + -- Harald Dunkel <[EMAIL PROTECTED]> Tue, 27 Dec 2005 15:23:41 +0100 + +nvidia-kernel (1.0.8178-0) unstable; urgency=low + + * new upstream + + -- Harald Dunkel <[EMAIL PROTECTED]> Sat, 24 Dec 2005 09:27:56 +0100 + +nvidia-kernel (1.0.8174-1) unstable; urgency=low + + * The "Radiohead" Release ;) + * New upstream. + * Upload to unstable. + * Thanks to Harald Dunkel for initial build. + * LEGACY GPUs: If you have a TNT, TNT2, Vanta, GeForce 256, GeForce DDR, + Quadro, GeForce2 Pro, GeForce2 GTS, GeForce2 Ultra, GeForce2 Ti, + Quadro2Pro, DO NOT INSTALL THIS RELEASE!!! They are not supported. + * update NEWS files again. + * add Xorg 6.8 to the descriptions to cut down on confusion. + * add reference to linux- kernel packages in README.Debian + * nvidia-xconfig will be in a separate package. + + -- Randall Donald <[EMAIL PROTECTED]> Sat, 10 Dec 2005 18:33:37 -0800 + +nvidia-kernel (1.0.8174-0) unstable; urgency=low + + * new upstream + + -- Harald Dunkel <[EMAIL PROTECTED]> Wed, 7 Dec 2005 19:40:50 +0100 + +nvidia-kernel (1.0.7676-2) experimental; urgency=low + + * add exit 0 to module postrm (closes: #252018) + * add more documentation to /etc/default/nvidia-glx (closes: #280237) + * reorganize nvidia-glx init script + * remove xserver provides (man this was an old addition) (closes: #329320) + * fix nvidia-glx-dev missing links (closes: #336778) + * now that sarge is stable upgrade DH_COMPAT to 5 (closes: #336734) + * Supply diversion for libglx.so to work with newer xorg. + + -- Randall Donald <[EMAIL PROTECTED]> Wed, 23 Nov 2005 01:20:12 +0000 + +nvidia-kernel (1.0.7676-1) experimental; urgency=low + + * New Upstream. (includes fix for GeForce FX 7880) + + -- Randall Donald <[EMAIL PROTECTED]> Mon, 29 Aug 2005 15:48:27 -0700 + +nvidia-kernel (1.0.7676-0) experimental; urgency=low + + * new upstream + + -- Harald Dunkel <[EMAIL PROTECTED]> Mon, 15 Aug 2005 21:53:07 +0200 + +nvidia-kernel (1.0.7667-3) experimental; urgency=low + + * back out libGL.so mess until it upgrades properly. + * move back to experimental while work is being done on the above. + + -- Randall Donald <[EMAIL PROTECTED]> Mon, 18 Jul 2005 13:08:11 -0700 + +nvidia-kernel (1.0.7667-2) unstable; urgency=low + + * fix dangling libGL.so issue. nvidia-glx by itself will now + link to the diverted xlibmesa library (closes: #208198, #306533, #272438) + * Move nvidia-kernel-source to Suggests in nvidia-glx (closes: #295891) + * Modify description to make note of GPUs NOT supported + * update module README.Debian to refer to nvnews.net forum. + (closes: #299916) + * Update nvidia-kernel-source README.Debian to mention module-assistant + and remove mention of patches that are unnecessary and other old + references. + * change upstream_info to not use bashisms. (closes: #304322) + * Update to policy 3.6.2 + * Move GL headers to /usr/share/nvidia/includes/GL. (closes: #268274) + * Remove unnecessary dependancy on libglu + * Add NEWS item about using legacy packages. + * LEGACY GPUs: If you have a TNT, TNT2, Vanta, GeForce 256, GeForce DDR, + Quadro, GeForce2 Pro, GeForce2 GTS, GeForce2 Ultra, GeForce2 Ti, Quadro2Pro, + DO NOT INSTALL THIS RELEASE!!! Use the nvidia-glx-legacy and + nvidia-kernel-source-legacy packages instead. + + -- Randall Donald <[EMAIL PROTECTED]> Wed, 13 Jul 2005 14:23:26 -0700 + +nvidia-kernel (1.0.7667-1) experimental; urgency=low + + * New upstream (closes: #315446) + * Thanks again to Harald Dunkel for patch and amd64 testing. + + -- Randall Donald <[EMAIL PROTECTED]> Fri, 24 Jun 2005 22:51:46 -0700 + +nvidia-kernel (1.0.7664-2) experimental; urgency=low + + * downgrade the libc6 change back to the version in unstable. + (closes: #315313) + + -- Randall Donald <[EMAIL PROTECTED]> Tue, 21 Jun 2005 14:07:42 -0700 + +nvidia-kernel (1.0.7664-1) experimental; urgency=low + + * The "Commander Cool Drew Hess" release. + * New upstream. (Thanks to Harald Dunkel for initial work) + * uploaded to experimental due to needing GLIBC_2.3.3 + and legacy support for some GPU's has been removed. + * Add news item about legacy support. + * LEGACY GPUs: If you have a TNT, TNT2, Vanta, GeForce 256, GeForce DDR, + Quadro, GeForce2 Pro, GeForce2 GTS, GeForce2 Ultra, GeForce2 Ti, Quadro2Pro, + DO NOT INSTALL THIS RELEASE!!! NVIDIA will be supporting these cards in a + special legacy driver (as yet unreleased and not included in this package). + So if you have the one of the above listed GPUs, + remain with the 1.0.7174-3 release. + + -- Randall Donald <[EMAIL PROTECTED]> Sat, 18 Jun 2005 16:46:48 -0700 + +nvidia-kernel (1.0.7664-0) unstable; urgency=low + + * New upstream. + + -- Harald Dunkel <[EMAIL PROTECTED]> Sat, 11 Jun 2005 22:42:26 +0200 + +nvidia-kernel (1.0.7174-3) unstable; urgency=low + + * reinclude nvidia docs + + -- Randall Donald <[EMAIL PROTECTED]> Thu, 7 Apr 2005 02:39:50 -0700 + +nvidia-kernel (1.0.7174-2) unstable; urgency=low + + * use -pkg2 (renamed to pkg0) for lib32 files in nvidia-glx-ia32 package + (closes: #257375) + + -- Randall Donald <[EMAIL PROTECTED]> Tue, 5 Apr 2005 15:10:03 -0700 + +nvidia-kernel (1.0.7174-1) unstable; urgency=low + + * New upstream. + * add nvidia-glx-ia32 package for amd64 (closes: #257375) + + -- Randall Donald <[EMAIL PROTECTED]> Fri, 1 Apr 2005 14:54:17 -0800 + +nvidia-kernel (1.0.7167-1) unstable; urgency=low + + * New upstream. (closes: #299073) + * Disable patching for new version. + + -- Randall Donald <[EMAIL PROTECTED]> Fri, 11 Mar 2005 13:46:57 -0800 + +nvidia-kernel (1.0.6629+1-2) unstable; urgency=high + + * Add patches for new (> 2.6.10-rc3-bk13) kernels from + minion.de. Thanks to Drew Hess <[EMAIL PROTECTED]> + (closes: #280224, #281640, #287226) + * updated minion patches from 16 Feb 2005 + * urgency high to get back in to sarge asap. + + -- Randall Donald <[EMAIL PROTECTED]> Fri, 18 Feb 2005 15:31:00 -0800 + +nvidia-kernel (1.0.6629+1-1) unstable; urgency=low + + * change version to allow for new .orig + + -- Randall Donald <[EMAIL PROTECTED]> Fri, 12 Nov 2004 11:06:00 -0800 + +nvidia-kernel (1.0.6629-2) unstable; urgency=low + + * Add amd64 support based on work from + Markus Benning <[EMAIL PROTECTED]> and + Harald Dunkel <[EMAIL PROTECTED]> + Thanks guys. + + -- Randall Donald <[EMAIL PROTECTED]> Tue, 9 Nov 2004 23:13:49 -0800 + +nvidia-kernel (1.0.6629-1) unstable; urgency=low + + * New upstream. + * Undo 2.6.9 patching. + + -- Randall Donald <[EMAIL PROTECTED]> Sat, 6 Nov 2004 23:21:06 -0800 + +nvidia-kernel (1.0.6111-2) unstable; urgency=low + + * Provide patches for kernels 2.6.9 and 2.6.10 + + -- Randall Donald <[EMAIL PROTECTED]> Mon, 25 Oct 2004 16:40:05 -0700 + +nvidia-kernel (1.0.6111-1) unstable; urgency=low + + * New upstream. + * add executable check for update-devfsd. + + -- Randall Donald <[EMAIL PROTECTED]> Thu, 5 Aug 2004 11:43:28 -0700 + +nvidia-kernel (1.0.6106-4) unstable; urgency=low + + * Use init script patch by Arthur de Jong <[EMAIL PROTECTED]> + (closes: #243308, #261165) + * Add read-only check to init script. (closes: #262176) + + -- Randall Donald <[EMAIL PROTECTED]> Sat, 31 Jul 2004 14:40:59 -0700 + +nvidia-kernel (1.0.6106-3) unstable; urgency=low + + * Remove libglx.so.version symlink cleaning now that it is an actual file + again. + + -- Randall Donald <[EMAIL PROTECTED]> Wed, 30 Jun 2004 22:00:09 -0700 + +nvidia-kernel (1.0.6106-2) unstable; urgency=low + + * Remove package nvidia-settings so I can use the GPL source in a separate + source package in contrib. + * Fix nvidia-glx-dev depends on nvidia-glx version. + + -- Randall Donald <[EMAIL PROTECTED]> Wed, 30 Jun 2004 17:48:06 -0700 + +nvidia-kernel (1.0.6106-1) unstable; urgency=low + + * New upstream. + fixed GL library symbols (closes: #242525) + * new nvidia-settings package. + * remolded TLS handling for new libnvidia-tls.so + * sysfs support now builtin, both dpatches disabled. + + -- Randall Donald <[EMAIL PROTECTED]> Wed, 30 Jun 2004 11:35:08 -0700 + +nvidia-kernel (1.0.5336-12) unstable; urgency=low + + * Include newer sysfs patch by Martin Schlemmer <[EMAIL PROTECTED]> which + should now create udev nodes. + (closes: #248451) + + -- Randall Donald <[EMAIL PROTECTED]> Tue, 29 Jun 2004 23:46:22 -0700 + +nvidia-kernel (1.0.5336-11) unstable; urgency=low + + * Correct nvidia-glx.shlibs. (closes: #249194) + * New init script from Arthur de Jong <[EMAIL PROTECTED]>. + (closes: #243308, #252569) + + -- Randall Donald <[EMAIL PROTECTED]> Tue, 8 Jun 2004 19:04:42 -0700 + +nvidia-kernel (1.0.5336-10) unstable; urgency=low + + * remove immediate exit in nvida-glx init.d so tls detection doesn't exit. + (closes: #247188) + + -- Randall Donald <[EMAIL PROTECTED]> Sat, 8 May 2004 13:44:21 -0700 + +nvidia-kernel (1.0.5336-9) unstable; urgency=low + + * use corrected 02_pcialias patch from Juergen Kreileder <[EMAIL PROTECTED]> + + -- Randall Donald <[EMAIL PROTECTED]> Fri, 30 Apr 2004 19:38:57 -0700 + +nvidia-kernel (1.0.5336-8) unstable; urgency=low + + * Allow for presence of 01_sysfs fuzz in 02_pcialias. (closes: #246773) + * Document in n-k-s.README.Debian about IGNORE_PCI_CLASS_DISPLAY + (closes: #246775) + + -- Randall Donald <[EMAIL PROTECTED]> Fri, 30 Apr 2004 18:52:47 -0700 + +nvidia-kernel (1.0.5336-7) unstable; urgency=low + + * also detect uppercase "GCC" in compiler detection. (closes: #243988) + * version dpatch at >= 2.0.0. (closes: #242465) + * patch for hotplugging. Thanks to Juergen Kreileder <[EMAIL PROTECTED]> + (closes: #239992) + * move libtool files to nvidia-glx-dev. (closes: #229110) + * apply patch from Joachim Breitner <[EMAIL PROTECTED]> for init script. + (closes: #243308) + * change shlibs to xlibmesa-gl | libgl1 + + -- Randall Donald <[EMAIL PROTECTED]> Sat, 17 Apr 2004 16:40:26 -0700 + +nvidia-kernel (1.0.5336-6) unstable; urgency=low + + * Introduce a boot init script for TLS detection. With this we can get rid + of the debconf prompting. (closes: #234612, #231397, #234323) + * Provide patch for sysfs. (closes: #236714, #234150) + * depend on dpatch for above patch. + * fix typo in clean target for SYSSRC. (closes: #237793) + * modify debian.binary/rules for patching and Makefile existance. + + -- Randall Donald <[EMAIL PROTECTED]> Fri, 19 Mar 2004 14:39:56 -0800 + +nvidia-kernel (1.0.5336-5) unstable; urgency=low + + * add SYSRC to clean target. (closes: #232313) + * Make GL depends more X 4.3 friendly. (closes: #188189) + * pass KPKG_EXTRAV_ARG in for proper 2.6 EXTRAVERSIONing + * version kernel-package at >=8.082. + * add root_cmd. (closes: #162323) + + -- Randall Donald <[EMAIL PROTECTED]> Sat, 21 Feb 2004 15:04:42 -0800 + +nvidia-kernel (1.0.5336-4) unstable; urgency=low + + * Add glext.h to nvidia-glx-dev. (closes: #231169) + * Add Makefile to clean target in nvidia-kernel-source rules file. + + -- Randall Donald <[EMAIL PROTECTED]> Wed, 4 Feb 2004 16:03:42 -0800 + +nvidia-kernel (1.0.5336-3) unstable; urgency=low + + * Depend on libc6-dev for KBUILD building. (closes: #230307) + + -- Randall Donald <[EMAIL PROTECTED]> Sat, 31 Jan 2004 14:26:02 -0800 + +nvidia-kernel (1.0.5336-2) unstable; urgency=low + + * Bypass NVIDIA's select_makefile (closes: #230307) + * Remove patch from nvidia-kernel-source Depends and add sed. + * Remove dangling libglx.so.VERSION symlink. + + -- Randall Donald <[EMAIL PROTECTED]> Fri, 30 Jan 2004 14:54:32 -0800 + +nvidia-kernel (1.0.5336-1) unstable; urgency=low + + * New upstream. + * generate nvidia-kernel changelog from nvidia-graphics-drivers at build. + * change nvidia-kernel-source arch to i386. (closes: #229060) + * remove 2.6 patch as it is now provided upstream. + * create a makefile selector and change the patchlevel detection to be based + on KERNEL_VERSION_CODE. + * switch back to Makefile.kbuild for 2.6.x. + * remove no longer needed apm patch. (closes: #228487) + * reflect 2.6 changes in nvidia-kernel-source.README.Debian. + + -- Randall Donald <[EMAIL PROTECTED]> Tue, 27 Jan 2004 00:01:32 -0800 + +nvidia-kernel (1.0.5328-4) unstable; urgency=low + + * Provide fixed .la files. (closes: #228677) + + -- Randall Donald <[EMAIL PROTECTED]> Mon, 19 Jan 2004 23:05:20 -0800 + +nvidia-kernel (1.0.5328-3) unstable; urgency=low + + * Remove bad/broken LibGL.la files for now. (closes: #228499) + + -- Randall Donald <[EMAIL PROTECTED]> Mon, 19 Jan 2004 14:56:14 -0800 + +nvidia-kernel (1.0.5328-2) unstable; urgency=low + + * Fix typo in nvidia-glx.README.Debian + + -- Randall Donald <[EMAIL PROTECTED]> Fri, 16 Jan 2004 23:53:35 -0800 + +nvidia-kernel (1.0.5328-1) unstable; urgency=low + + * New upstream. (closes #227066) + * Apply 2.6 patch in nvidia-kernel building with env override. + Manual patching no longer required!!! (closes: #193379) + * Change text of TLS question to a positive tone. (closes: #221963) + * Quote $(CC) for a multi word compiler e.g. distcc (closes: #222390) + * Change reportbug script to use (lspci --version) instead of which. + * Add tls/libGL.so to nvidia-glx (so one can switch with only one step) + * Make note about reconfiguring for TLS switching. + * fix gcc detection again for kernel compiler. (closes: #227412) + * fix typo in nvidia-kernel-source.README.Debian (closes: #226991) + + -- Randall Donald <[EMAIL PROTECTED]> Mon, 22 Dec 2003 01:21:58 -0800 + +nvidia-kernel (1.0.4496-10) unstable; urgency=low + + * TLS problems related to installation of TLS libs on 2.4 systems. + Solution: provide a debconf note and set a default based on runtime + detection of a TLS/2.6 system. Hopefully this will solve most of the + tls bugs. + * Add note about nvidia-kernel-source in nvidia-glx description. + (closes: #220038) + + -- Randall Donald <[EMAIL PROTECTED]> Wed, 19 Nov 2003 13:17:50 -0800 + +nvidia-kernel (1.0.4496-9) unstable; urgency=low + + * Change nvidia-kernel-source.README.Debian.in to reflect 2.6 makefile + change. (closes: #219003) + * Note the difference in KSRC for 2.6 headers (closes: #220452) + + -- Randall Donald <[EMAIL PROTECTED]> Mon, 17 Nov 2003 20:47:20 -0800 + +nvidia-kernel (1.0.4496-8) unstable; urgency=low + + * Correctly install tls libglx. + + -- Randall Donald <[EMAIL PROTECTED]> Sat, 1 Nov 2003 12:46:04 -0800 + +nvidia-kernel (1.0.4496-7) unstable; urgency=low + + * add tls files. (closes: #218408, #218417, #218434, #218487) + + -- Randall Donald <[EMAIL PROTECTED]> Fri, 31 Oct 2003 21:01:18 -0800 + +nvidia-kernel (1.0.4496-6) unstable; urgency=low + + * use Makefile.nvidia instead of Makefile.kbuild so the 2.6 support + can use kernel-headers. Manual patching still required. + README.Debian changed to instruct this change. + (closes: #208535, #203369) + * remove wget build-dep from kernel module (closes: #212742) + * install kernel module to /lib/modules/KVERS/nvidia. (closes: #207290) + * re-fix GCC detection from compile.h (closes: #205871) + + -- Randall Donald <[EMAIL PROTECTED]> Mon, 6 Oct 2003 21:41:13 -0700 + +nvidia-kernel (1.0.4496-5) unstable; urgency=low + + * Add symlink instruction to nvidia-kernel-source.README.Debian + * Fix patchlevel version detection. + + -- Randall Donald <[EMAIL PROTECTED]> Tue, 23 Sep 2003 01:21:29 -0700 + +nvidia-kernel (1.0.4496-4) unstable; urgency=low + + * Add Provides: nvidia-kernel-src to nvidia-kernel-source (closes: #211713) + * Upload new diversions and 2.6 support to unstable packages. + * change == to = in kernel rules file. + + -- Randall Donald <[EMAIL PROTECTED]> Mon, 22 Sep 2003 15:34:32 -0700 + +nvidia-kernel (1.0.4496-3) experimental; urgency=low + + * Fix nvidia-kernel-source.README.Debian about installing + nvidia-kernel-common first. + * Fix typo in nvidia-kernel-source.README.Debian regarding + modules/nvidia-kernel-1.0.4496 directory. (closes: #205684) + * Change diversions to stay within /usr/lib and /usr/X11R6/lib. + This allows for installs on systems of /usr split between several + partitions. (closes: #205955) + * Move nvidia-glx dependancy on nvidia-kernel-source to a recommends. + * Fix part of gcc 3.3.1 detection that I missed last time. (closes: #205871) + * Update nvidia-kernel-source.README.Debian to reflect 2.4.21-4-k7. + * Add preliminary 2.6 support. See README.Debian for details (closes: #203369, #193379) + * Include CONFIG_APM_MODULE patch file in nvidia-kernel-source. + * Upload to experimental due to diversion changes and preliminary 2.6 + support + * Incorporate the NMU by martin f. krafft <[EMAIL PROTECTED]> + + -- Randall Donald <[EMAIL PROTECTED]> Tue, 26 Aug 2003 14:42:57 -0700 + +nvidia-kernel (1.0.4496-2.1) unstable; urgency=low + + * debian.binary/rules used the -a flag to copy the control.template file + to debian-binary/control. If the former was a symlink, this would result + in the erasure of the template file as the destionation of the copy would + also be a symlink to the same file. Removed the -a, now it works just + fine. + Closes: Bug#206445, Bug#206449 + + -- martin f. krafft <[EMAIL PROTECTED]> Tue, 26 Aug 2003 08:50:46 +0200 + +nvidia-kernel (1.0.4496-2) unstable; urgency=low + + * Add email from NVIDIA to copyright file. + + -- Randall Donald <[EMAIL PROTECTED]> Thu, 31 Jul 2003 15:18:25 -0700 + +nvidia-kernel (1.0.4496-1) unstable; urgency=low + + * New upstream. + * include shlibs file. + * Re-split nvidia-glx-dev by request. + + -- Randall Donald <[EMAIL PROTECTED]> Mon, 28 Jul 2003 14:18:45 -0700 + +nvidia-kernel (1.0.4363-1) unstable; urgency=low + + * Put nvidia drivers into one source package + * Move from contrib to non-free + * Rename nvidia-kernel-src to nvidia-kernel-source + * Include driver files in nvidia-glx and nvidia-kernel-source instead of + downloading. + * Put nvidia-glx-dev files back into nvidia-glx. + * Separate out modules and devfs files into nvidia-kernel-common. + * Drop .deb in builder-specified location. Thanks David B Harris + <[EMAIL PROTECTED]> (closes: #192112) + * Lose the version number in modules directory. (closes: #199509) + * Use automation of versioning based on patches by Marcello Magallon + <[EMAIL PROTECTED]>. Thanks. (closes: #192312, #192311) + + -- Randall Donald <[EMAIL PROTECTED]> Fri, 9 May 2003 14:51:15 -0700 + diff -urN ../n2/nvidia-graphics-drivers-1.0.8756/debian.binary/changelog.rej nvidia-graphics-drivers-1.0.8756/debian.binary/changelog.rej --- ../n2/nvidia-graphics-drivers-1.0.8756/debian.binary/changelog.rej 1970-01-01 01:00:00.000000000 +0100 +++ nvidia-graphics-drivers-1.0.8756/debian.binary/changelog.rej 2006-04-10 08:47:26.000000000 +0200 @@ -0,0 +1,28 @@ +*************** +*** 1,3 **** + nvidia-kernel (1.0.8178-1) unstable; urgency=low + + * Upload to archive. +--- 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.
/Rasmus -- -- [ Rasmus "Møffe" Bøg Hansen ] --------------------------------------- Personally I've found since the invention of alcohol there's been little time or call for anything else to be invented. Cups would be nice though. -- Kieran John on ~afda ----------------------------------------------[ moffe at zz9 dot dk ] --