Package: nvidia-graphics-drivers-legacy-96xx Version: 1.0.9639-1 Severity: normal Tags: patch
Hi, while creating the dpatch for #425127, I did some more cleanup: * run debian/rules version-change (there were to many outdated references) * ToDo: Since many files in debian are auto-generated, couldn't most of them be removed by debian/rules clean? * debian/rules: clean debian.binary/changelog (autogenerated) * debian/rules: don't run perl -e 's/.../.../'... on directories (e.g. debian.binary/patches. ToDo: better reindent this ... just wanted to minimize the patch * debian.binary/control.template: add Conflicts: nvidia-kernel-KVERS, nvidia-kernel-legacy-KVERS (they provide the same file: .../nvidia.ko) * debian/nvidia-glx-legacy-96xx.shlibs: refresh (was still using nvidia-glx instead of nvidia-glx-legacy-96xx) * debian.binary/override.template, debian/nvidia-glx-legacy-96xx.override.in: refresh (were still nvidia-glx instead of nvidia-glx-legacy-96xx), drop old and add new overrides * debian/rules: run dh_strip (drop .note, .comment sections) FIXME: is it OK to strip the shipped libraries? Otherwise add more overrides ... The following lintian warnings/errors are left: W: nvidia-graphics-drivers-legacy-96xx source: out-of-date-standards-version 3.6.2 (current is 3.7.2) E: nvidia-glx-legacy-96xx-dev: maintainer-script-calls-init-script-directly postinst:9 E: nvidia-glx-legacy-96xx-dev: maintainer-script-calls-init-script-directly postrm:13 W: nvidia-glx-legacy-96xx: binary-without-manpage usr/bin/nvidia-bug-report.sh W: nvidia-glx-legacy-96xx: script-with-language-extension usr/bin/nvidia-bug-report.sh W: nvidia-glx-legacy-96xx: shlibs-declares-dependency-on-other-package xlibmesa-gl | libgl1 E: nvidia-glx-legacy-96xx: maintainer-script-removes-device-files postrm:31 W: nvidia-glx-legacy-96xx: extended-description-line-too-long W: nvidia-glx-legacy-96xx: init.d-script-missing-lsb-section /etc/init.d/nvidia-glx-legacy-96xx There are no more warnings/errors for the nvidia-kernel-legacy-96xx module package. Andreas -- System Information: Debian Release: lenny/sid APT prefers testing APT policy: (500, 'testing'), (500, 'stable'), (300, 'unstable'), (30, 'experimental') Architecture: i386 (i686) Kernel: Linux 2.6.18-4-k7 (SMP w/1 CPU core) Locale: LANG=C, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash
diff -ur old/debian/changelog new/debian/changelog --- old/debian/changelog 2007-07-15 00:47:21.000000000 +0200 +++ new/debian/changelog 2007-07-15 00:47:41.000000000 +0200 @@ -1,3 +1,23 @@ +nvidia-graphics-drivers-legacy-96xx (1.0.9639-1.0anbe0) unstable; urgency=low + + * Non-maintainer upload. + * run debian/rules version-change + * debian/rules: + - clean debian.binary/changelog + - don't run perl/sed on directories (e.g. debian.binary/patches) + * debian.binary/patches/05_paravirt_ops: new, work around paravirt_ops + issues (closes: #425127) + * debian.binary/control.template: add Conflicts: nvidia-kernel-KVERS, + nvidia-kernel-legacy-KVERS (file conflicts: nvidia.ko) + * debian.binary/override.template: + - mknod-in-maintainer-script: refresh line numbers + - drop unstripped-binary-or-object: .../nvidia.o + * debian/nvidia-glx-legacy-96xx.override.in: refresh + * debian/nvidia-glx-legacy-96xx.shlibs: refresh + * debian/rules: run dh_strip to get rid of superfluous sections + + -- Andreas Beckmann <[EMAIL PROTECTED]> Sun, 15 Jul 2007 00:00:09 +0200 + nvidia-graphics-drivers-legacy-96xx (1.0.9639-1) unstable; urgency=low * new upstream. diff -ur old/debian/control new/debian/control --- old/debian/control 2007-07-15 00:47:21.000000000 +0200 +++ new/debian/control 2007-07-15 00:47:41.000000000 +0200 @@ -8,8 +8,8 @@ Package: nvidia-glx-legacy-96xx-ia32 Architecture: amd64 -Depends: nvidia-kernel-legacy--96xx-1.0.9631, ia32-libs, ${shlibs:Depends} -Suggests: nvidia-settings, nvidia-kernel-legacy-96xx-source (>= 1.0.9631) +Depends: nvidia-kernel-legacy-96xx-1.0.9639, ia32-libs, ${shlibs:Depends} +Suggests: nvidia-settings, nvidia-kernel-legacy-96xx-source (>= 1.0.9639) Conflicts: nvidia-glx-src, nvidia-glx-ia32 Replaces: nvidia-glx-src, nvidia-glx-legacy-ia32, nvidia-glx-legacy-71xx-ia32 Description: NVIDIA binary Xorg driver (96xx legacy version) @@ -22,8 +22,8 @@ Package: nvidia-glx-legacy-96xx Architecture: i386 amd64 -Depends: nvidia-kernel-legacy-96xx-1.0.9631, x11-common (>= 1:7.0.0), ${shlibs:Depends} -Suggests: nvidia-settings, nvidia-kernel-legacy-96xx-source (>= 1.0.9631) +Depends: nvidia-kernel-legacy-96xx-1.0.9639, x11-common (>= 1:7.0.0), ${shlibs:Depends} +Suggests: nvidia-settings, nvidia-kernel-legacy-96xx-source (>= 1.0.9639) Conflicts: nvidia-glx-src, nvidia-glx-legacy-dev, nvidia-glx-legacy-71xx, nvidia-glx Provides: xserver-xorg-video-1.0 Replaces: nvidia-glx-src, nvidia-glx-legacy @@ -52,9 +52,9 @@ Package: nvidia-glx-legacy-96xx-dev Architecture: i386 amd64 -Depends: nvidia-glx-legacy-96xx (>= 1.0.9631) +Depends: nvidia-glx-legacy-96xx (>= 1.0.9639) Provides: libgl-dev -Conflicts: nvidia-glx-legacy-96xx (>= 1.0.9632), libgl-dev, mesa-common-dev, nvidia-glx-legacy-71xx-dev, nvidia-glx-dev +Conflicts: nvidia-glx-legacy-96xx (>= 1.0.9640), libgl-dev, mesa-common-dev, nvidia-glx-legacy-71xx-dev, nvidia-glx-dev Replaces: libgl-dev, nvidia-glx-legacy Description: NVIDIA Xorg driver development files (96xx legacy version) This package contains the NVIDIA binary Xorg driver @@ -66,8 +66,8 @@ Package: nvidia-kernel-legacy-96xx-source Architecture: i386 amd64 Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) -Recommends: nvidia-glx-legacy-96xx (>= 1.0.9631), kernel-package (>= 8.082), devscripts -Conflicts: nvidia-kernel-src, nvidia-kernel-legacy-source, nvidia-kernel-legacy-71xx-source +Recommends: nvidia-glx-legacy-96xx (>= 1.0.9639), kernel-package (>= 8.082), devscripts +Conflicts: nvidia-kernel-src, nvidia-kernel-legacy-source Replaces: nvidia-kernel-src, nvidia-kernel-legacy-source Description: NVIDIA binary kernel module source (96xx legacy version) This package builds the NVIDIA Xorg binary kernel module diff -ur old/debian/copyright new/debian/copyright --- old/debian/copyright 2007-07-15 00:47:21.000000000 +0200 +++ new/debian/copyright 2007-07-15 00:47:41.000000000 +0200 @@ -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-9631/NVIDIA-Linux-x86_64-1.0-9631-pkg2.run +ftp://download.nvidia.com/XFree86/Linux-x86/1.0-9639/NVIDIA-Linux-x86-1.0-9639-pkg0.run Upstream Author: NVIDIA <[EMAIL PROTECTED]> diff -ur old/debian/nvidia-glx-legacy-96xx-dev.links new/debian/nvidia-glx-legacy-96xx-dev.links --- old/debian/nvidia-glx-legacy-96xx-dev.links 2007-07-15 00:47:21.000000000 +0200 +++ new/debian/nvidia-glx-legacy-96xx-dev.links 2007-07-15 00:47:41.000000000 +0200 @@ -1,2 +1,2 @@ -#usr/lib/libGL.so.1.0.9631 usr/lib/libGL.so +#usr/lib/libGL.so.1.0.9639 usr/lib/libGL.so usr/share/nvidia/include /usr/share/doc/nvidia-glx-dev/include diff -ur old/debian/nvidia-glx-legacy-96xx-dev.preinst new/debian/nvidia-glx-legacy-96xx-dev.preinst --- old/debian/nvidia-glx-legacy-96xx-dev.preinst 2007-07-15 00:47:21.000000000 +0200 +++ new/debian/nvidia-glx-legacy-96xx-dev.preinst 2007-07-15 00:47:41.000000000 +0200 @@ -70,7 +70,7 @@ # dpkg-divert --add --rename --package nvidia-glx-legacy-96xx-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.9631 /usr/lib/libGL.so || true +# ln -s /usr/lib/libGL.so.1.0.9639 /usr/lib/libGL.so || true # dpkg-divert --add --rename --package nvidia-glx-legacy-96xx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null diff -ur old/debian/nvidia-glx-legacy-96xx-ia32.links new/debian/nvidia-glx-legacy-96xx-ia32.links --- old/debian/nvidia-glx-legacy-96xx-ia32.links 2007-07-15 00:47:21.000000000 +0200 +++ new/debian/nvidia-glx-legacy-96xx-ia32.links 2007-07-15 00:47:41.000000000 +0200 @@ -1,4 +1,4 @@ -emul/ia32-linux/usr/lib/libGL.so.1.0.9631 emul/ia32-linux/usr/lib/libGL.so.1 -emul/ia32-linux/usr/lib/libGL.so.1.0.9631 emul/ia32-linux/usr/lib/libGL.so -emul/ia32-linux/usr/lib/libGLcore.so.1.0.9631 emul/ia32-linux/usr/lib/libGLcore.so -emul/ia32-linux/usr/lib/libnvidia-tls.so.1.0.9631 emul/ia32-linux/usr/lib/libnvidia-tls.so.1 +emul/ia32-linux/usr/lib/libGL.so.1.0.9639 emul/ia32-linux/usr/lib/libGL.so.1 +emul/ia32-linux/usr/lib/libGL.so.1.0.9639 emul/ia32-linux/usr/lib/libGL.so +emul/ia32-linux/usr/lib/libGLcore.so.1.0.9639 emul/ia32-linux/usr/lib/libGLcore.so +emul/ia32-linux/usr/lib/libnvidia-tls.so.1.0.9639 emul/ia32-linux/usr/lib/libnvidia-tls.so.1 diff -ur old/debian/nvidia-glx-legacy-96xx-ia32.override new/debian/nvidia-glx-legacy-96xx-ia32.override --- old/debian/nvidia-glx-legacy-96xx-ia32.override 2007-07-15 00:47:21.000000000 +0200 +++ new/debian/nvidia-glx-legacy-96xx-ia32.override 2007-07-15 00:47:41.000000000 +0200 @@ -1,9 +1,9 @@ -nvidia-glx-ia32: library-not-linked-against-libc ./emul/ia32-linux/usr/lib/libGL.so.1.0.9631 +nvidia-glx-ia32: library-not-linked-against-libc ./emul/ia32-linux/usr/lib/libGL.so.1.0.9639 -nvidia-glx-ia32: shared-lib-without-dependency-information ./emul/ia32-linux/usr/lib/libGLcore.so.1.0.9631 +nvidia-glx-ia32: shared-lib-without-dependency-information ./emul/ia32-linux/usr/lib/libGLcore.so.1.0.9639 -nvidia-glx-ia32: shlib-with-non-pic-code emul/ia32-linux/usr/lib/libGL.so.1.0.9631 -nvidia-glx-ia32: shlib-with-non-pic-code emul/ia32-linux/usr/lib/libGLcore.so.1.0.9631 +nvidia-glx-ia32: shlib-with-non-pic-code emul/ia32-linux/usr/lib/libGL.so.1.0.9639 +nvidia-glx-ia32: shlib-with-non-pic-code emul/ia32-linux/usr/lib/libGLcore.so.1.0.9639 -nvidia-glx-ia32: non-dev-pkg-with-shlib-symlink emul/ia32-linux/usr/lib/libGL.so.1.0.9631 emul/ia32-linux/usr/lib/libGL.so +nvidia-glx-ia32: non-dev-pkg-with-shlib-symlink emul/ia32-linux/usr/lib/libGL.so.1.0.9639 emul/ia32-linux/usr/lib/libGL.so diff -ur old/debian/nvidia-glx-legacy-96xx.docs new/debian/nvidia-glx-legacy-96xx.docs --- old/debian/nvidia-glx-legacy-96xx.docs 2007-07-15 00:47:21.000000000 +0200 +++ new/debian/nvidia-glx-legacy-96xx.docs 2007-07-15 00:47:41.000000000 +0200 @@ -1,2 +1,2 @@ -NVIDIA-Linux-x86_64-1.0-9631-pkg2/usr/share/doc/NVIDIA_Changelog -NVIDIA-Linux-x86_64-1.0-9631-pkg2/usr/share/doc/README.txt +NVIDIA-Linux-x86-1.0-9639-pkg0/usr/share/doc/NVIDIA_Changelog +NVIDIA-Linux-x86-1.0-9639-pkg0/usr/share/doc/README.txt diff -ur old/debian/nvidia-glx-legacy-96xx.examples new/debian/nvidia-glx-legacy-96xx.examples --- old/debian/nvidia-glx-legacy-96xx.examples 2007-07-15 00:47:21.000000000 +0200 +++ new/debian/nvidia-glx-legacy-96xx.examples 2007-07-15 00:47:41.000000000 +0200 @@ -1,2 +1,2 @@ -NVIDIA-Linux-x86_64-1.0-9631-pkg2/usr/share/doc/XF86Config.sample +NVIDIA-Linux-x86-1.0-9639-pkg0/usr/share/doc/XF86Config.sample diff -ur old/debian/nvidia-glx-legacy-96xx.init new/debian/nvidia-glx-legacy-96xx.init --- old/debian/nvidia-glx-legacy-96xx.init 2007-07-15 00:47:21.000000000 +0200 +++ new/debian/nvidia-glx-legacy-96xx.init 2007-07-15 00:47:41.000000000 +0200 @@ -28,7 +28,7 @@ setup_links () { # check if all the symlinks are in place - if [ "$(readlink -f /usr/lib/tls/libnvidia-tls.so.1)" != /usr/lib/nvidia/libnvidia-tls.so.1.0.9631 ] + if [ "$(readlink -f /usr/lib/tls/libnvidia-tls.so.1)" != /usr/lib/nvidia/libnvidia-tls.so.1.0.9639 ] then echo -n "Creating NVIDIA TLS links..." # remove the symlinks @@ -43,7 +43,7 @@ rm -f /usr/lib/tls/libGLcore.so.1 rm -f /usr/lib/tls/libGLcore.so.* # create the symlinks - ln -s /usr/lib/nvidia/libnvidia-tls.so.1.0.9631 /usr/lib/tls/libnvidia-tls.so.1.0.9631 + ln -s /usr/lib/nvidia/libnvidia-tls.so.1.0.9639 /usr/lib/tls/libnvidia-tls.so.1.0.9639 # reconfigure dynamic linker run-time bindings ldconfig echo " done." @@ -52,7 +52,7 @@ remove_links () { # check if all the symlinks are gone or correct - if [ -e /usr/lib/tls/libnvidia-tls.so.1.0.9631 \ + if [ -e /usr/lib/tls/libnvidia-tls.so.1.0.9639 \ -o -e /usr/lib/tls/libnvidia-tls.so \ -o -e /usr/lib/tls/libnvidia-tls.so.1 ] then @@ -83,8 +83,8 @@ if [ -L /usr/lib/nvidia/libGL.so.xlibmesa ] && [ -d /usr/share/doc/libgl1-mesa-dev ] ; then ln -s /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so fi - if [ -d /usr/share/doc/nvidia-glx-dev ] ; then - ln -s /usr/lib/libGL.so.1.0.9631 /usr/lib/libGL.so + if [ -d /usr/share/doc/nvidia-glx-legacy-96xx-dev ] ; then + ln -s /usr/lib/libGL.so.1.0.9639 /usr/lib/libGL.so fi ;; diff -ur old/debian/nvidia-glx-legacy-96xx.links new/debian/nvidia-glx-legacy-96xx.links --- old/debian/nvidia-glx-legacy-96xx.links 2007-07-15 00:47:21.000000000 +0200 +++ new/debian/nvidia-glx-legacy-96xx.links 2007-07-15 00:47:41.000000000 +0200 @@ -1,7 +1,7 @@ -usr/lib/libGL.so.1.0.9631 usr/lib/libGL.so.1 -usr/lib/libGLcore.so.1.0.9631 usr/lib/libGLcore.so.1 -usr/lib/libnvidia-tls.so.1.0.9631 usr/lib/libnvidia-tls.so.1 -usr/lib/xorg/modules/extensions/libglx.so.1.0.9631 usr/lib/xorg/modules/extensions/libglx.so -usr/lib/libXvMCNVIDIA.so.1.0.9631 usr/lib/libXvMCNVIDIA.so.1 -usr/lib/libXvMCNVIDIA.so.1.0.9631 usr/lib/libXvMCNVIDIA_dynamic.so.1 +usr/lib/libGL.so.1.0.9639 usr/lib/libGL.so.1 +usr/lib/libGLcore.so.1.0.9639 usr/lib/libGLcore.so.1 +usr/lib/libnvidia-tls.so.1.0.9639 usr/lib/libnvidia-tls.so.1 +usr/lib/xorg/modules/extensions/libglx.so.1.0.9639 usr/lib/xorg/modules/extensions/libglx.so +usr/lib/libXvMCNVIDIA.so.1.0.9639 usr/lib/libXvMCNVIDIA.so.1 +usr/lib/libXvMCNVIDIA.so.1.0.9639 usr/lib/libXvMCNVIDIA_dynamic.so.1 diff -ur old/debian/nvidia-glx-legacy-96xx.override new/debian/nvidia-glx-legacy-96xx.override --- old/debian/nvidia-glx-legacy-96xx.override 2007-07-15 00:47:21.000000000 +0200 +++ new/debian/nvidia-glx-legacy-96xx.override 2007-07-15 00:47:41.000000000 +0200 @@ -1,14 +1,23 @@ -nvidia-glx: library-not-linked-against-libc ./usr/lib/libGL.so.1.0.9631 +nvidia-glx-legacy-96xx: several-sonames-in-same-package libGL.so.1 libGLcore.so.1 libXvMCNVIDIA_dynamic.so.1 libnvidia-tls.so.1 -nvidia-glx: shared-lib-without-dependency-information ./usr/lib/libGLcore.so.1.0.9631 +nvidia-glx-legacy-96xx: package-name-doesnt-match-sonames libGL1 libGLcore1 libXvMCNVIDIA-dynamic1 libnvidia-tls1 -nvidia-glx: library-not-linked-against-libc ./usr/lib/xorg/modules/extensions/libglx.so.1.0.9631 +nvidia-glx-legacy-96xx: shared-lib-without-dependency-information ./usr/lib/libGLcore.so.1.0.9639 +nvidia-glx-legacy-96xx: shared-lib-without-dependency-information ./usr/lib/libnvidia-tls.so.1.0.9639 +nvidia-glx-legacy-96xx: shared-lib-without-dependency-information ./usr/lib/nvidia/libnvidia-tls.so.1.0.9639 -nvidia-glx: shlib-with-non-pic-code usr/lib/libGL.so.1.0.9631 -nvidia-glx: shlib-with-non-pic-code usr/lib/libGLcore.so.1.0.9631 -nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/modules/extensions/libglx.so.1.0.9631 -nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/libXvMCNVIDIA.so.1.0.9631 -nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/libXvMCNVIDIA.so.1.0.9631 +nvidia-glx-legacy-96xx: shlib-with-non-pic-code usr/lib/libGL.so.1.0.9639 +nvidia-glx-legacy-96xx: shlib-with-non-pic-code usr/lib/libGLcore.so.1.0.9639 +nvidia-glx-legacy-96xx: shlib-with-non-pic-code usr/lib/libXvMCNVIDIA.so.1.0.9639 +nvidia-glx-legacy-96xx: shlib-with-non-pic-code usr/lib/libnvidia-tls.so.1.0.9639 +nvidia-glx-legacy-96xx: shlib-with-non-pic-code usr/lib/nvidia/libnvidia-cfg.so.1.0.9639 +nvidia-glx-legacy-96xx: shlib-with-non-pic-code usr/lib/nvidia/libnvidia-tls.so.1.0.9639 +nvidia-glx-legacy-96xx: shlib-with-non-pic-code usr/lib/xorg/modules/extensions/libglx.so.1.0.9639 -nvidia-glx: non-dev-pkg-with-shlib-symlink usr/lib/libGL.so.1.0.9631 usr/lib/libGL.so -nvidia-glx: non-dev-pkg-with-shlib-symlink usr/lib/xorg/modules/extensions/libglx.so.1.0.9631 usr/lib/xorg/modules/extensions/libglx.so +nvidia-glx-legacy-96xx: shlib-without-PT_GNU_STACK-section usr/lib/libGL.so.1.0.9639 +nvidia-glx-legacy-96xx: shlib-without-PT_GNU_STACK-section usr/lib/libGLcore.so.1.0.9639 +nvidia-glx-legacy-96xx: shlib-without-PT_GNU_STACK-section usr/lib/libXvMCNVIDIA.so.1.0.9639 +nvidia-glx-legacy-96xx: shlib-without-PT_GNU_STACK-section usr/lib/libnvidia-tls.so.1.0.9639 +nvidia-glx-legacy-96xx: shlib-without-PT_GNU_STACK-section usr/lib/nvidia/libnvidia-cfg.so.1.0.9639 +nvidia-glx-legacy-96xx: shlib-without-PT_GNU_STACK-section usr/lib/nvidia/libnvidia-tls.so.1.0.9639 +nvidia-glx-legacy-96xx: shlib-without-PT_GNU_STACK-section usr/lib/xorg/modules/extensions/libglx.so.1.0.9639 diff -ur old/debian/nvidia-glx-legacy-96xx.override.in new/debian/nvidia-glx-legacy-96xx.override.in --- old/debian/nvidia-glx-legacy-96xx.override.in 2007-07-15 00:47:21.000000000 +0200 +++ new/debian/nvidia-glx-legacy-96xx.override.in 2007-07-15 00:47:41.000000000 +0200 @@ -1,14 +1,23 @@ -nvidia-glx: library-not-linked-against-libc ./usr/lib/libGL.so.#VERSION# +nvidia-glx-legacy-96xx: several-sonames-in-same-package libGL.so.1 libGLcore.so.1 libXvMCNVIDIA_dynamic.so.1 libnvidia-tls.so.1 -nvidia-glx: shared-lib-without-dependency-information ./usr/lib/libGLcore.so.#VERSION# +nvidia-glx-legacy-96xx: package-name-doesnt-match-sonames libGL1 libGLcore1 libXvMCNVIDIA-dynamic1 libnvidia-tls1 -nvidia-glx: library-not-linked-against-libc ./usr/lib/xorg/modules/extensions/libglx.so.#VERSION# +nvidia-glx-legacy-96xx: shared-lib-without-dependency-information ./usr/lib/libGLcore.so.#VERSION# +nvidia-glx-legacy-96xx: shared-lib-without-dependency-information ./usr/lib/libnvidia-tls.so.#VERSION# +nvidia-glx-legacy-96xx: shared-lib-without-dependency-information ./usr/lib/nvidia/libnvidia-tls.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/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-legacy-96xx: shlib-with-non-pic-code usr/lib/libGL.so.#VERSION# +nvidia-glx-legacy-96xx: shlib-with-non-pic-code usr/lib/libGLcore.so.#VERSION# +nvidia-glx-legacy-96xx: shlib-with-non-pic-code usr/lib/libXvMCNVIDIA.so.#VERSION# +nvidia-glx-legacy-96xx: shlib-with-non-pic-code usr/lib/libnvidia-tls.so.#VERSION# +nvidia-glx-legacy-96xx: shlib-with-non-pic-code usr/lib/nvidia/libnvidia-cfg.so.#VERSION# +nvidia-glx-legacy-96xx: shlib-with-non-pic-code usr/lib/nvidia/libnvidia-tls.so.#VERSION# +nvidia-glx-legacy-96xx: shlib-with-non-pic-code usr/lib/xorg/modules/extensions/libglx.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/lib/xorg/modules/extensions/libglx.so.#VERSION# usr/lib/xorg/modules/extensions/libglx.so +nvidia-glx-legacy-96xx: shlib-without-PT_GNU_STACK-section usr/lib/libGL.so.#VERSION# +nvidia-glx-legacy-96xx: shlib-without-PT_GNU_STACK-section usr/lib/libGLcore.so.#VERSION# +nvidia-glx-legacy-96xx: shlib-without-PT_GNU_STACK-section usr/lib/libXvMCNVIDIA.so.#VERSION# +nvidia-glx-legacy-96xx: shlib-without-PT_GNU_STACK-section usr/lib/libnvidia-tls.so.#VERSION# +nvidia-glx-legacy-96xx: shlib-without-PT_GNU_STACK-section usr/lib/nvidia/libnvidia-cfg.so.#VERSION# +nvidia-glx-legacy-96xx: shlib-without-PT_GNU_STACK-section usr/lib/nvidia/libnvidia-tls.so.#VERSION# +nvidia-glx-legacy-96xx: shlib-without-PT_GNU_STACK-section usr/lib/xorg/modules/extensions/libglx.so.#VERSION# diff -ur old/debian/nvidia-glx-legacy-96xx.postrm new/debian/nvidia-glx-legacy-96xx.postrm --- old/debian/nvidia-glx-legacy-96xx.postrm 2007-07-15 00:47:21.000000000 +0200 +++ new/debian/nvidia-glx-legacy-96xx.postrm 2007-07-15 00:47:41.000000000 +0200 @@ -28,7 +28,7 @@ dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx --divert /usr/lib/nvidia/libglx.so.xlibmesa /usr/lib/xorg/modules/extensions/libglx.so > /dev/null dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null - rm -f /usr/lib/xorg/modules/extensions/libglx.so.1.0.9631 2> /dev/null || true + rm -f /usr/lib/xorg/modules/extensions/libglx.so.1.0.9639 2> /dev/null || true if [ -d /usr/lib/nvidia ]; then rmdir /usr/lib/nvidia/ || true; fi @@ -48,7 +48,7 @@ esac -#rm -f /usr/lib/xorg/modules/extensions/libglx.so.1.0.9631 2> /dev/null || true +#rm -f /usr/lib/xorg/modules/extensions/libglx.so.1.0.9639 2> /dev/null || true diff -ur old/debian/nvidia-glx-legacy-96xx.shlibs new/debian/nvidia-glx-legacy-96xx.shlibs --- old/debian/nvidia-glx-legacy-96xx.shlibs 2007-07-15 00:47:21.000000000 +0200 +++ new/debian/nvidia-glx-legacy-96xx.shlibs 2007-07-15 00:47:41.000000000 +0200 @@ -1,4 +1,4 @@ libGL 1 xlibmesa-gl | libgl1 libGLcore 1 xlibmesa-gl | libgl1 -libXvMCNVIDIA_dynamic 1 nvidia-glx -libnvidia-tls 1 nvidia-glx +libXvMCNVIDIA_dynamic 1 nvidia-glx-legacy-96xx +libnvidia-tls 1 nvidia-glx-legacy-96xx diff -ur old/debian/nvidia-kernel-legacy-96xx-source.README.Debian new/debian/nvidia-kernel-legacy-96xx-source.README.Debian --- old/debian/nvidia-kernel-legacy-96xx-source.README.Debian 2007-07-15 00:47:21.000000000 +0200 +++ new/debian/nvidia-kernel-legacy-96xx-source.README.Debian 2007-07-15 00:47:41.000000000 +0200 @@ -58,10 +58,10 @@ As root (or using fakeroot) 1. cd /usr/src - tar xzvf nvidia-kernel-source.tar.gz -C <YOUR BUILD LOCATION> + tar xzvf nvidia-kernel-legacy-96xx-source.tar.gz -C <YOUR BUILD LOCATION> (It will install in <YOU BUILD LOCATION>/modules) - or - - tar xzvf nvidia-kernel-source.tar.gz (if building in /usr/src) + tar xzvf nvidia-kernel-legacy-96xx-source.tar.gz (if building in /usr/src) The standard build location is /usr/src @@ -84,7 +84,7 @@ 5. Then build nvidia-kernel package: - cd <YOUR BUILD LOCATION>/modules/nvidia-kernel + cd <YOUR BUILD LOCATION>/modules/nvidia-kernel-legacy-96xx debian/rules binary_modules (You can also combine step 4 and 5 into one line: @@ -98,7 +98,7 @@ 7. Install the nvidia-kernel package: - dpkg -i ../nvidia-kernel-2.6.14-2-k7_1.0.9631-1+_.Custom_i386.deb + dpkg -i ../nvidia-kernel-legacy-96xx-2.6.14-2-k7_1.0.9639-1+_.Custom_i386.deb ( or similar filename ) Now see GENERAL NOTES below method #2 @@ -111,10 +111,10 @@ As root 1. cd /usr/src - tar xzvf nvidia-kernel-source.tar.gz -C <YOUR BUILD LOCATION> + tar xzvf nvidia-kernel-legacy-96xx-source.tar.gz -C <YOUR BUILD LOCATION> (It will install in <YOU BUILD LOCATION>/modules) - or - - tar xzvf nvidia-kernel-source.tar.gz (if building in /usr/src) + tar xzvf nvidia-kernel-legacy-96xx-source.tar.gz (if building in /usr/src) 2. If you are NOT using the default modules location /usr/src/modules then you must set an environment variable that points to your modules @@ -138,7 +138,7 @@ 5. Install the nvidia-kernel package: cd <YOUR BUILD LOCATION> (e.g. /usr/src) - dpkg -i nvidia-kernel-KVER*.deb + dpkg -i nvidia-kernel-legacy-96xx-KVER*.deb Notes for method #2: @@ -165,7 +165,7 @@ For any news on this package check http://people.debian.org/~rdonald and -http://bugs.debian.org/nvidia-kernel-source +http://bugs.debian.org/nvidia-kernel-legacy-96xx-source -- Randall Donald <[EMAIL PROTECTED]>, Fri, 30 Apr 2004 19:02:04 -0700 diff -ur old/debian/nvidia-kernel-legacy-96xx-source.docs new/debian/nvidia-kernel-legacy-96xx-source.docs --- old/debian/nvidia-kernel-legacy-96xx-source.docs 2007-07-15 00:47:21.000000000 +0200 +++ new/debian/nvidia-kernel-legacy-96xx-source.docs 2007-07-15 00:47:41.000000000 +0200 @@ -1,2 +1,2 @@ -NVIDIA-Linux-x86_64-1.0-9631-pkg2/usr/share/doc/NVIDIA_Changelog -NVIDIA-Linux-x86_64-1.0-9631-pkg2/usr/share/doc/README.txt +NVIDIA-Linux-x86-1.0-9639-pkg0/usr/share/doc/NVIDIA_Changelog +NVIDIA-Linux-x86-1.0-9639-pkg0/usr/share/doc/README.txt diff -ur old/debian/rules new/debian/rules --- old/debian/rules 2007-07-15 00:47:21.000000000 +0200 +++ new/debian/rules 2007-07-15 00:47:41.000000000 +0200 @@ -97,6 +97,8 @@ cp -r $(CURDIR)/debian.binary/* $(CURDIR)/debian/temp/modules/nvidia-kernel-legacy-96xx/debian for f in `ls $(CURDIR)/debian.binary` ; do \ + if test -f $(CURDIR)/debian.binary/$$f ; \ + then \ perl -p \ -e 's{#BASE_VERSION#}{$(base_version)}g;' \ -e 's{#RELEASE#}{$(release)}g;' \ @@ -105,6 +107,7 @@ -e 's{#URL#}{$(url)}g' \ < $(CURDIR)/debian.binary/$$f > $(CURDIR)/debian/temp/modules/nvidia-kernel-legacy-96xx/debian/$$f ; \ chmod 0644 $(CURDIR)/debian/temp/modules/nvidia-kernel-legacy-96xx/debian/$$f ; \ + fi ; \ done chmod 755 $(CURDIR)/debian/temp/modules/nvidia-kernel-legacy-96xx/debian/patches cp $(CURDIR)/$(dirname)/usr/src/nv/* $(CURDIR)/debian/temp/modules/nvidia-kernel-legacy-96xx/nv || true @@ -120,6 +123,7 @@ dh_testroot rm -f build-stamp build-kernel-stamp configure-stamp dh_clean + rm -f debian.binary/changelog rm -fr $(dirname) nvidia-kernel-legacy-96xx-source.tar.gz @@ -229,7 +233,7 @@ # dh_installinfo dh_installman dh_link -# dh_strip + dh_strip dh_compress -X.h -X README.Debian dh_fixperms # dh_perl Only in old/debian.binary: changelog diff -ur old/debian.binary/control.template new/debian.binary/control.template --- old/debian.binary/control.template 2007-07-15 00:47:21.000000000 +0200 +++ new/debian.binary/control.template 2007-07-15 00:47:41.000000000 +0200 @@ -10,6 +10,7 @@ Provides: nvidia-kernel-legacy-96xx-#VERSION# Depends: nvidia-kernel-common (>= 20050829) Recommends: linux-image-#KVERS# +Conflicts: nvidia-kernel-#KVERS#, nvidia-kernel-legacy-#KVERS# Description: NVIDIA binary kernel module for Linux #KVERS# These Xorg binary drivers provide optimized hardware acceleration of OpenGL applications via a direct-rendering X Server and support the diff -ur old/debian.binary/override.template new/debian.binary/override.template --- old/debian.binary/override.template 2007-07-15 00:47:21.000000000 +0200 +++ new/debian.binary/override.template 2007-07-15 00:47:41.000000000 +0200 @@ -1,3 +1,2 @@ -nvidia-kernel-#KVERS#: mknod-in-maintainer-script postinst:32 -nvidia-kernel-#KVERS#: mknod-in-maintainer-script postinst:41 -nvidia-kernel-#KVERS#: unstripped-binary-or-object ./lib/modules/#KVERS#/kernel/drivers/video/nvidia.o +nvidia-kernel-legacy-96xx-#KVERS#: mknod-in-maintainer-script postinst:36 +nvidia-kernel-legacy-96xx-#KVERS#: mknod-in-maintainer-script postinst:45 diff -ur old/debian.binary/patches/00list new/debian.binary/patches/00list --- old/debian.binary/patches/00list 2007-07-15 00:47:21.000000000 +0200 +++ new/debian.binary/patches/00list 2007-07-15 00:47:41.000000000 +0200 @@ -2,3 +2,4 @@ 02_pcialias 03_pci_get_class 04_minion +05_paravirt_ops Only in new/debian.binary/patches: 05_paravirt_ops diff -ur old/debian.binary/rules new/debian.binary/rules --- old/debian.binary/rules 2007-07-15 00:47:21.000000000 +0200 +++ new/debian.binary/rules 2007-07-15 00:47:41.000000000 +0200 @@ -106,6 +106,8 @@ dpatch apply 02_pcialias ; \ dpatch status 02_pcialias >>patch-stamp ; \ fi ; \ + dpatch apply 05_paravirt_ops ; \ + dpatch status 05_paravirt_ops >>patch-stamp ; \ fi if [ $(PATCHLEVEL) = 4 ]; then \