[pkg-nvidia-devel] r323 - in /packages/nvidia-graphics-drivers-legacy-96xx/trunk: debian.binary/ debian/
rdonald at users.alioth.debian.org
rdonald at users.alioth.debian.org
Thu Oct 4 17:37:47 UTC 2007
Author: rdonald
Date: Thu Oct 4 17:37:46 2007
New Revision: 323
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=323
Log:
new upstream with bug fixes and xorg 7.3 changes
Modified:
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/changelog
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/control.template
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/override.template
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/control
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/control.in
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/copyright
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-dev.links
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-dev.preinst
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.links
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.override
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.docs
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.examples
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.init
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.links
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.override
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.override.in
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.postrm
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.shlibs
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-kernel-legacy-96xx-source.README.Debian
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-kernel-legacy-96xx-source.docs
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/upstream_info
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/changelog?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/changelog Thu Oct 4 17:37:46 2007
@@ -1,3 +1,10 @@
+nvidia-kernel-legacy-96xx (1.0.9639-1) unstable; urgency=low
+
+ * new upstream.
+ * remove kernel-source conflict. (closes: #425693)
+
+ -- Randall Donald <rdonald at debian.org> Sun, 17 Jun 2007 17:52:08 -0700
+
nvidia-kernel-legacy-96xx (1.0.9631-3) unstable; urgency=low
* Argh. Fix typo in depends. I really need to get the packaging team
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/control.template
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/control.template?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/control.template (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/control.template Thu Oct 4 17:37:46 2007
@@ -9,6 +9,7 @@
Architecture: i386 amd64
Provides: nvidia-kernel-legacy-96xx-#VERSION#
Depends: nvidia-kernel-common (>= 20050829)
+Conflicts: nvidia-kernel-#KVERS#, nvidia-kernel-legacy-#KVERS#
Recommends: linux-image-#KVERS#
Description: NVIDIA binary kernel module for Linux #KVERS#
These Xorg binary drivers provide optimized hardware acceleration of
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/override.template
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/override.template?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/override.template (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/override.template Thu Oct 4 17:37:46 2007
@@ -1,3 +1,3 @@
-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
+
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog Thu Oct 4 17:37:46 2007
@@ -1,3 +1,21 @@
+nvidia-graphics-drivers-legacy-96xx (96.43.01-1) UNRELEASED; urgency=low
+
+ * New upstream
+ * Xorg 7.3 compatible (closes: #443112)
+ * change maintainership to pkg-nvidia
+ * provide xserver-xorg-video-2 and depend on xserver-xorg-core (>= 2:1.4)
+ * remove use of update-modules
+ * divert libGLcore.so
+ * From Andreas Beckmann <debian at abeckmann.de>: (closes: #433154)
+ - 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
+ - fix nvidia-glx and nvidia-kernel references
+
+ -- Randall Donald <rdonald at debian.org> Thu, 04 Oct 2007 10:24:50 -0700
+
nvidia-graphics-drivers-legacy-96xx (1.0.9639-1) unstable; urgency=low
* new upstream.
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/control?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/control Thu Oct 4 17:37:46 2007
@@ -1,15 +1,15 @@
Source: nvidia-graphics-drivers-legacy-96xx
Section: non-free/x11
Priority: optional
-Maintainer: Randall Donald <rdonald at debian.org>
+Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel at lists.alioth.debian.org>
Build-Depends: debhelper (>> 4.0.0), sed (>> 3.0)
Standards-Version: 3.6.2
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-96.43.01, ia32-libs, ${shlibs:Depends}
+Suggests: nvidia-settings, nvidia-kernel-legacy-96xx-source (>= 96.43.01)
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,10 +22,10 @@
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-96.43.01, x11-common (>= 7.3+2), xserver-xorg-core (>= 2:1.4)${shlibs:Depends}
+Suggests: nvidia-settings, nvidia-kernel-legacy-96xx-source (>= 96.43.01)
Conflicts: nvidia-glx-src, nvidia-glx-legacy-dev, nvidia-glx-legacy-71xx, nvidia-glx
-Provides: xserver-xorg-video-1.0
+Provides: xserver-xorg-video-2
Replaces: nvidia-glx-src, nvidia-glx-legacy
Description: NVIDIA binary Xorg driver (96xx legacy version)
These XFree86 4.0 / Xorg binary drivers provide optimized hardware
@@ -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 (>= 96.43.01)
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 (>= 96.43.02), 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 (>= 96.43.01), 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
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/control.in?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/control.in (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/control.in Thu Oct 4 17:37:46 2007
@@ -1,7 +1,7 @@
Source: nvidia-graphics-drivers-legacy-96xx
Section: non-free/x11
Priority: optional
-Maintainer: Randall Donald <rdonald at debian.org>
+Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel at lists.alioth.debian.org>
Build-Depends: debhelper (>> 4.0.0), sed (>> 3.0)
Standards-Version: 3.6.2
@@ -22,10 +22,10 @@
Package: nvidia-glx-legacy-96xx
Architecture: i386 amd64
-Depends: nvidia-kernel-legacy-96xx-#VERSION#, x11-common (>= 1:7.0.0), ${shlibs:Depends}
+Depends: nvidia-kernel-legacy-96xx-#VERSION#, x11-common (>= 7.3+2), xserver-xorg-core (>= 2:1.4)${shlibs:Depends}
Suggests: nvidia-settings, nvidia-kernel-legacy-96xx-source (>= #VERSION#)
Conflicts: nvidia-glx-src, nvidia-glx-legacy-dev, nvidia-glx-legacy-71xx, nvidia-glx
-Provides: xserver-xorg-video-1.0
+Provides: xserver-xorg-video-2
Replaces: nvidia-glx-src, nvidia-glx-legacy
Description: NVIDIA binary Xorg driver (96xx legacy version)
These XFree86 4.0 / Xorg binary drivers provide optimized hardware
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/copyright?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/copyright (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/copyright Thu Oct 4 17:37:46 2007
@@ -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_64/96.43.01/NVIDIA-Linux-x86_64-96.43.01-pkg2.run
Upstream Author: NVIDIA <linux-bugs at nvidia.com>
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-dev.links
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-dev.links?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-dev.links (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-dev.links Thu Oct 4 17:37:46 2007
@@ -1,2 +1,2 @@
-#usr/lib/libGL.so.1.0.9631 usr/lib/libGL.so
+#usr/lib/libGL.so.96.43.01 usr/lib/libGL.so
usr/share/nvidia/include /usr/share/doc/nvidia-glx-dev/include
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-dev.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-dev.preinst?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-dev.preinst (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-dev.preinst Thu Oct 4 17:37:46 2007
@@ -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.96.43.01 /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
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.links
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.links?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.links (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.links Thu Oct 4 17:37:46 2007
@@ -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.96.43.01 emul/ia32-linux/usr/lib/libGL.so.1
+emul/ia32-linux/usr/lib/libGL.so.96.43.01 emul/ia32-linux/usr/lib/libGL.so
+emul/ia32-linux/usr/lib/libGLcore.so.96.43.01 emul/ia32-linux/usr/lib/libGLcore.so
+emul/ia32-linux/usr/lib/libnvidia-tls.so.96.43.01 emul/ia32-linux/usr/lib/libnvidia-tls.so.1
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.override
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.override?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.override (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.override Thu Oct 4 17:37:46 2007
@@ -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.96.43.01
-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.96.43.01
-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.96.43.01
+nvidia-glx-ia32: shlib-with-non-pic-code emul/ia32-linux/usr/lib/libGLcore.so.96.43.01
-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.96.43.01 emul/ia32-linux/usr/lib/libGL.so
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.docs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.docs?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.docs (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.docs Thu Oct 4 17:37:46 2007
@@ -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_64-96.43.01-pkg2/usr/share/doc/NVIDIA_Changelog
+NVIDIA-Linux-x86_64-96.43.01-pkg2/usr/share/doc/README.txt
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.examples
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.examples?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.examples (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.examples Thu Oct 4 17:37:46 2007
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-1.0-9631-pkg2/usr/share/doc/XF86Config.sample
+NVIDIA-Linux-x86_64-96.43.01-pkg2/usr/share/doc/XF86Config.sample
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.init
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.init?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.init (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.init Thu Oct 4 17:37:46 2007
@@ -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.96.43.01 ]
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.96.43.01 /usr/lib/tls/libnvidia-tls.so.96.43.01
# 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.96.43.01 \
-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.96.43.01 /usr/lib/libGL.so
fi
;;
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.links
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.links?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.links (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.links Thu Oct 4 17:37:46 2007
@@ -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.96.43.01 usr/lib/libGL.so.1
+usr/lib/libGLcore.so.96.43.01 usr/lib/libGLcore.so.1
+usr/lib/libnvidia-tls.so.96.43.01 usr/lib/libnvidia-tls.so.1
+usr/lib/xorg/modules/extensions/libglx.so.96.43.01 usr/lib/xorg/modules/extensions/libglx.so
+usr/lib/libXvMCNVIDIA.so.96.43.01 usr/lib/libXvMCNVIDIA.so.1
+usr/lib/libXvMCNVIDIA.so.96.43.01 usr/lib/libXvMCNVIDIA_dynamic.so.1
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.override
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.override?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.override (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.override Thu Oct 4 17:37:46 2007
@@ -1,14 +1,24 @@
-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-legacy-96xx: package-name-doesnt-match-sonames libGL1 libGLcore1 libXvMCNVIDIA-dynamic1 libnvidia-tls1
+
+nvidia-glx-legacy-96xx: shared-lib-without-dependency-information ./usr/lib/libGLcore.so.96.43.01
+nvidia-glx-legacy-96xx: shared-lib-without-dependency-information ./usr/lib/libnvidia-tls.so.96.43.01
+nvidia-glx-legacy-96xx: shared-lib-without-dependency-information ./usr/lib/nvidia/libnvidia-tls.so.96.43.01
+
+nvidia-glx-legacy-96xx: shlib-with-non-pic-code usr/lib/libGL.so.96.43.01
+nvidia-glx-legacy-96xx: shlib-with-non-pic-code usr/lib/libGLcore.so.96.43.01
+nvidia-glx-legacy-96xx: shlib-with-non-pic-code usr/lib/libXvMCNVIDIA.so.96.43.01
+nvidia-glx-legacy-96xx: shlib-with-non-pic-code usr/lib/libnvidia-tls.so.96.43.01
+nvidia-glx-legacy-96xx: shlib-with-non-pic-code usr/lib/nvidia/libnvidia-cfg.so.96.43.01
+nvidia-glx-legacy-96xx: shlib-with-non-pic-code usr/lib/nvidia/libnvidia-tls.so.96.43.01
+nvidia-glx-legacy-96xx: shlib-with-non-pic-code usr/lib/xorg/modules/extensions/libglx.so.96.43.01
+
-nvidia-glx: shared-lib-without-dependency-information ./usr/lib/libGLcore.so.1.0.9631
-
-nvidia-glx: library-not-linked-against-libc ./usr/lib/xorg/modules/extensions/libglx.so.1.0.9631
-
-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: 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.96.43.01
+nvidia-glx-legacy-96xx: shlib-without-PT_GNU_STACK-section usr/lib/libGLcore.so.96.43.01
+nvidia-glx-legacy-96xx: shlib-without-PT_GNU_STACK-section usr/lib/libXvMCNVIDIA.so.96.43.01
+nvidia-glx-legacy-96xx: shlib-without-PT_GNU_STACK-section usr/lib/libnvidia-tls.so.96.43.01
+nvidia-glx-legacy-96xx: shlib-without-PT_GNU_STACK-section usr/lib/nvidia/libnvidia-cfg.so.96.43.01
+nvidia-glx-legacy-96xx: shlib-without-PT_GNU_STACK-section usr/lib/nvidia/libnvidia-tls.so.96.43.01
+nvidia-glx-legacy-96xx: shlib-without-PT_GNU_STACK-section usr/lib/xorg/modules/extensions/libglx.so.96.43.01
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.override.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.override.in?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.override.in (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.override.in Thu Oct 4 17:37:46 2007
@@ -1,14 +1,24 @@
-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-legacy-96xx: package-name-doesnt-match-sonames libGL1 libGLcore1 libXvMCNVIDIA-dynamic1 libnvidia-tls1
+
+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-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: shared-lib-without-dependency-information ./usr/lib/libGLcore.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/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/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#
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.postrm?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.postrm (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.postrm Thu Oct 4 17:37:46 2007
@@ -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.96.43.01 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.96.43.01 2> /dev/null || true
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.shlibs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.shlibs?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.shlibs (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx.shlibs Thu Oct 4 17:37:46 2007
@@ -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
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-kernel-legacy-96xx-source.README.Debian
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-kernel-legacy-96xx-source.README.Debian?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-kernel-legacy-96xx-source.README.Debian (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-kernel-legacy-96xx-source.README.Debian Thu Oct 4 17:37:46 2007
@@ -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_96.43.01-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 <rdonald at debian.org>, Fri, 30 Apr 2004 19:02:04 -0700
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-kernel-legacy-96xx-source.docs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-kernel-legacy-96xx-source.docs?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-kernel-legacy-96xx-source.docs (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-kernel-legacy-96xx-source.docs Thu Oct 4 17:37:46 2007
@@ -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_64-96.43.01-pkg2/usr/share/doc/NVIDIA_Changelog
+NVIDIA-Linux-x86_64-96.43.01-pkg2/usr/share/doc/README.txt
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/upstream_info
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/upstream_info?rev=323&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/upstream_info (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/upstream_info Thu Oct 4 17:37:46 2007
@@ -1,17 +1,17 @@
eval `dpkg-architecture`
-BASE_VERSION=1.0
-RELEASE=9639
-NEXTVER=1.0.9640
+#BASE_VERSION=1.0
+RELEASE=96.43.01
+NEXTVER=96.43.02
if [ "$DEB_BUILD_ARCH" = "amd64" ] ; then
- BASE_URL=ftp://download.nvidia.com/XFree86/Linux-x86_64/${BASE_VERSION}-${RELEASE}
- DIRNAME=NVIDIA-Linux-x86_64-${BASE_VERSION}-${RELEASE}-pkg2
+ BASE_URL=ftp://download.nvidia.com/XFree86/Linux-x86_64/${RELEASE}
+ DIRNAME=NVIDIA-Linux-x86_64-${RELEASE}-pkg2
# change this on next version release
FILENAME=$DIRNAME.run
elif [ "$DEB_BUILD_ARCH" = "i386" ] ; then
- BASE_URL=ftp://download.nvidia.com/XFree86/Linux-x86/${BASE_VERSION}-${RELEASE}
- DIRNAME=NVIDIA-Linux-x86-${BASE_VERSION}-${RELEASE}-pkg0
+ BASE_URL=ftp://download.nvidia.com/XFree86/Linux-x86/${RELEASE}
+ DIRNAME=NVIDIA-Linux-x86-${RELEASE}-pkg0
FILENAME="$DIRNAME.run"
else
echo "huh? dont know about a version of this driver for your architecture."
@@ -19,8 +19,8 @@
fi
-VERSION=${BASE_VERSION}.${RELEASE}
-UPSTREAMVERSION=${BASE_VERSION}-${RELEASE}
+VERSION=${RELEASE}
+UPSTREAMVERSION=${RELEASE}
URL=${BASE_URL}/${FILENAME}
case "$1" in
More information about the Pkg-nvidia-devel
mailing list