[pkg-nvidia-devel] r340 - in /packages/nvidia-graphics-drivers/trunk: debian.binary/ debian.binary/patches/ debian/
rdonald at users.alioth.debian.org
rdonald at users.alioth.debian.org
Thu Jan 3 20:34:15 UTC 2008
Author: rdonald
Date: Thu Jan 3 20:34:14 2008
New Revision: 340
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=340
Log:
bug fixes. start of mutliarch detection
Removed:
packages/nvidia-graphics-drivers/trunk/debian.binary/patches/
Modified:
packages/nvidia-graphics-drivers/trunk/debian.binary/rules
packages/nvidia-graphics-drivers/trunk/debian/changelog
packages/nvidia-graphics-drivers/trunk/debian/control
packages/nvidia-graphics-drivers/trunk/debian/copyright
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.preinst
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.override
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.override
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm
packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian
packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.docs
packages/nvidia-graphics-drivers/trunk/debian/rules
packages/nvidia-graphics-drivers/trunk/debian/upstream_info
Modified: packages/nvidia-graphics-drivers/trunk/debian.binary/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/rules?rev=340&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/rules Thu Jan 3 20:34:14 2008
@@ -282,8 +282,8 @@
.PHONY: kdist_image
kdist_image:
echo "ROOT_CMD = $(ROOT_CMD)"
- $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules binary_modules
- $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules clean
+ $(MAKE) $(MFLAGS) -f debian/rules binary_modules
+ $(MAKE) $(MFLAGS) -f debian/rules clean
@@ -292,12 +292,12 @@
# other kdist_commands (except for the .deb files created).
.PHONY: kdist_clean
kdist_clean:
- $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules clean
+ $(MAKE) $(MFLAGS) -f debian/rules clean
kdist:
- $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules binary_modules
+ $(MAKE) $(MFLAGS) -f debian/rules binary_modules
# Build a .changes file.
dpkg-genchanges -b -e"$(KMAINT) <$(KEMAIL)>" -u"$(CURDIR)/../.." > $(CHFILE)
debsign -e"$(KMAINT) <$(KEMAIL)>" $(CHFILE)
- $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules clean
+ $(MAKE) $(MFLAGS) -f debian/rules clean
Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=340&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Thu Jan 3 20:34:14 2008
@@ -1,3 +1,21 @@
+nvidia-graphics-drivers (169.07-1) UNRELEASED; urgency=low
+
+ * New upstream.
+ * Remove ROOT_CMD from debian.binary/rules (closes: 416594)
+ * include both nv-kernel.o and detect which to use at kernel-source
+ build time. (closes: #458295, #437128)
+ * move patches dir out of the way.
+
+ -- Randall Donald <rdonald at debian.org> Fri, 21 Dec 2007 22:54:29 -0800
+
+nvidia-graphics-drivers (100.14.19-2) UNRELEASED; urgency=low
+
+ * Add linux-modules-nonfree-2.6 integration (closes: #446232)
+ - rename tarball to nvidia-kernel.tar.bz2
+ - add toplevel Makefile
+
+ -- Randall Donald <rdonald at debian.org> Thu, 01 Nov 2007 10:23:13 -0700
+
nvidia-graphics-drivers (100.14.19-1) unstable; urgency=low
* new upstream.
Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=340&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Thu Jan 3 20:34:14 2008
@@ -10,8 +10,8 @@
Package: nvidia-glx-ia32
Architecture: amd64
-Depends: nvidia-kernel-100.14.19, ia32-libs, ${shlibs:Depends}
-Suggests: nvidia-settings, nvidia-kernel-source (>= 100.14.19)
+Depends: nvidia-kernel-169.07, ia32-libs, ${shlibs:Depends}
+Suggests: nvidia-settings, nvidia-kernel-source (>= 169.07)
Conflicts: nvidia-glx-src
Replaces: nvidia-glx-src
Description: NVIDIA binary XFree86 4.x driver
@@ -64,8 +64,8 @@
Package: nvidia-glx
Architecture: i386 amd64
-Depends: nvidia-kernel-100.14.19, x11-common (>= 1:7.0.0), xserver-xorg-core (>= 2:1.4), ${shlibs:Depends}
-Suggests: nvidia-settings, nvidia-kernel-source (>= 100.14.19)
+Depends: nvidia-kernel-169.07, x11-common (>= 1:7.0.0), xserver-xorg-core (>= 2:1.4), ${shlibs:Depends}
+Suggests: nvidia-settings, nvidia-kernel-source (>= 169.07)
Conflicts: nvidia-glx-src, nvidia-glx-dev (<< 1.0.8774-5)
Provides: xserver-xorg-video-2
Replaces: nvidia-glx-src
@@ -122,9 +122,9 @@
Package: nvidia-glx-dev
Architecture: i386 amd64
-Depends: nvidia-glx (>= 100.14.19)
+Depends: nvidia-glx (>= 169.07)
Provides: libgl-dev
-Conflicts: nvidia-glx (>= 100.14.20), libgl-dev, mesa-common-dev
+Conflicts: nvidia-glx (>= 169.08), libgl-dev, mesa-common-dev
Replaces: libgl-dev
Description: NVIDIA binary Xorg driver development files
This package contains the NVIDIA binary Xorg driver
@@ -136,7 +136,7 @@
Package: nvidia-kernel-source
Architecture: i386 amd64
Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0)
-Recommends: nvidia-glx (>= 100.14.19), kernel-package (>= 8.082), devscripts
+Recommends: nvidia-glx (>= 169.07), kernel-package (>= 8.082), devscripts
Conflicts: nvidia-kernel-src
Replaces: nvidia-kernel-src
Description: NVIDIA binary kernel module source
Modified: packages/nvidia-graphics-drivers/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/copyright?rev=340&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/copyright (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/copyright Thu Jan 3 20:34:14 2008
@@ -2,7 +2,7 @@
Mon, 31 Mar 2003 23:40:05 -0800.
It was downloaded from
-ftp://download.nvidia.com/XFree86/Linux-x86_64/100.14.19/NVIDIA-Linux-x86_64-100.14.19-pkg2.run
+ftp://download.nvidia.com/XFree86/Linux-x86_64/169.07/NVIDIA-Linux-x86_64-169.07-pkg2.run
Upstream Author: NVIDIA <linux-bugs at nvidia.com>
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links?rev=340&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links Thu Jan 3 20:34:14 2008
@@ -1,2 +1,2 @@
-#usr/lib/libGL.so.100.14.19 usr/lib/libGL.so
+#usr/lib/libGL.so.169.07 usr/lib/libGL.so
usr/share/nvidia/include /usr/share/doc/nvidia-glx-dev/include
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.preinst?rev=340&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.preinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.preinst Thu Jan 3 20:34:14 2008
@@ -70,7 +70,7 @@
# 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.100.14.19 /usr/lib/libGL.so || true
+# ln -s /usr/lib/libGL.so.169.07 /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
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links?rev=340&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links Thu Jan 3 20:34:14 2008
@@ -1,4 +1,4 @@
-emul/ia32-linux/usr/lib/libGL.so.100.14.19 emul/ia32-linux/usr/lib/libGL.so.1
-emul/ia32-linux/usr/lib/libGL.so.100.14.19 emul/ia32-linux/usr/lib/libGL.so
-emul/ia32-linux/usr/lib/libGLcore.so.100.14.19 emul/ia32-linux/usr/lib/libGLcore.so
-emul/ia32-linux/usr/lib/libnvidia-tls.so.100.14.19 emul/ia32-linux/usr/lib/libnvidia-tls.so.1
+emul/ia32-linux/usr/lib/libGL.so.169.07 emul/ia32-linux/usr/lib/libGL.so.1
+emul/ia32-linux/usr/lib/libGL.so.169.07 emul/ia32-linux/usr/lib/libGL.so
+emul/ia32-linux/usr/lib/libGLcore.so.169.07 emul/ia32-linux/usr/lib/libGLcore.so
+emul/ia32-linux/usr/lib/libnvidia-tls.so.169.07 emul/ia32-linux/usr/lib/libnvidia-tls.so.1
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.override
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.override?rev=340&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.override (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.override Thu Jan 3 20:34:14 2008
@@ -1,9 +1,9 @@
-nvidia-glx-ia32: library-not-linked-against-libc ./emul/ia32-linux/usr/lib/libGL.so.100.14.19
+nvidia-glx-ia32: library-not-linked-against-libc ./emul/ia32-linux/usr/lib/libGL.so.169.07
-nvidia-glx-ia32: shared-lib-without-dependency-information ./emul/ia32-linux/usr/lib/libGLcore.so.100.14.19
+nvidia-glx-ia32: shared-lib-without-dependency-information ./emul/ia32-linux/usr/lib/libGLcore.so.169.07
-nvidia-glx-ia32: shlib-with-non-pic-code emul/ia32-linux/usr/lib/libGL.so.100.14.19
-nvidia-glx-ia32: shlib-with-non-pic-code emul/ia32-linux/usr/lib/libGLcore.so.100.14.19
+nvidia-glx-ia32: shlib-with-non-pic-code emul/ia32-linux/usr/lib/libGL.so.169.07
+nvidia-glx-ia32: shlib-with-non-pic-code emul/ia32-linux/usr/lib/libGLcore.so.169.07
-nvidia-glx-ia32: non-dev-pkg-with-shlib-symlink emul/ia32-linux/usr/lib/libGL.so.100.14.19 emul/ia32-linux/usr/lib/libGL.so
+nvidia-glx-ia32: non-dev-pkg-with-shlib-symlink emul/ia32-linux/usr/lib/libGL.so.169.07 emul/ia32-linux/usr/lib/libGL.so
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs?rev=340&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs Thu Jan 3 20:34:14 2008
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-100.14.19-pkg2/usr/share/doc/NVIDIA_Changelog
-NVIDIA-Linux-x86_64-100.14.19-pkg2/usr/share/doc/README.txt
+NVIDIA-Linux-x86_64-169.07-pkg2/usr/share/doc/NVIDIA_Changelog
+NVIDIA-Linux-x86_64-169.07-pkg2/usr/share/doc/README.txt
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples?rev=340&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.examples Thu Jan 3 20:34:14 2008
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-100.14.19-pkg2/usr/share/doc/XF86Config.sample
+NVIDIA-Linux-x86_64-169.07-pkg2/usr/share/doc/XF86Config.sample
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init?rev=340&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.init Thu Jan 3 20:34:14 2008
@@ -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.100.14.19 ]
+ if [ "$(readlink -f /usr/lib/tls/libnvidia-tls.so.1)" != /usr/lib/nvidia/libnvidia-tls.so.169.07 ]
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.100.14.19 /usr/lib/tls/libnvidia-tls.so.100.14.19
+ ln -s /usr/lib/nvidia/libnvidia-tls.so.169.07 /usr/lib/tls/libnvidia-tls.so.169.07
# 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.100.14.19 \
+ if [ -e /usr/lib/tls/libnvidia-tls.so.169.07 \
-o -e /usr/lib/tls/libnvidia-tls.so \
-o -e /usr/lib/tls/libnvidia-tls.so.1 ]
then
@@ -84,7 +84,7 @@
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.100.14.19 /usr/lib/libGL.so
+ ln -s /usr/lib/libGL.so.169.07 /usr/lib/libGL.so
fi
;;
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links?rev=340&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links Thu Jan 3 20:34:14 2008
@@ -1,7 +1,7 @@
-usr/lib/libGL.so.100.14.19 usr/lib/libGL.so.1
-usr/lib/libGLcore.so.100.14.19 usr/lib/libGLcore.so.1
-usr/lib/libnvidia-tls.so.100.14.19 usr/lib/libnvidia-tls.so.1
-usr/lib/xorg/modules/extensions/libglx.so.100.14.19 usr/lib/xorg/modules/extensions/libglx.so
-usr/lib/libXvMCNVIDIA.so.100.14.19 usr/lib/libXvMCNVIDIA.so.1
-usr/lib/libXvMCNVIDIA.so.100.14.19 usr/lib/libXvMCNVIDIA_dynamic.so.1
-usr/lib/xorg/modules/libnvidia-wfb.so.100.14.19 usr/lib/xorg/modules/libwfb.so
+usr/lib/libGL.so.169.07 usr/lib/libGL.so.1
+usr/lib/libGLcore.so.169.07 usr/lib/libGLcore.so.1
+usr/lib/libnvidia-tls.so.169.07 usr/lib/libnvidia-tls.so.1
+usr/lib/xorg/modules/extensions/libglx.so.169.07 usr/lib/xorg/modules/extensions/libglx.so
+usr/lib/libXvMCNVIDIA.so.169.07 usr/lib/libXvMCNVIDIA.so.1
+usr/lib/libXvMCNVIDIA.so.169.07 usr/lib/libXvMCNVIDIA_dynamic.so.1
+usr/lib/xorg/modules/libnvidia-wfb.so.169.07 usr/lib/xorg/modules/libwfb.so
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.override
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.override?rev=340&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.override (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.override Thu Jan 3 20:34:14 2008
@@ -1,14 +1,14 @@
-nvidia-glx: library-not-linked-against-libc ./usr/lib/libGL.so.100.14.19
+nvidia-glx: library-not-linked-against-libc ./usr/lib/libGL.so.169.07
-nvidia-glx: shared-lib-without-dependency-information ./usr/lib/libGLcore.so.100.14.19
+nvidia-glx: shared-lib-without-dependency-information ./usr/lib/libGLcore.so.169.07
-nvidia-glx: library-not-linked-against-libc ./usr/lib/xorg/modules/extensions/libglx.so.100.14.19
+nvidia-glx: library-not-linked-against-libc ./usr/lib/xorg/modules/extensions/libglx.so.169.07
-nvidia-glx: shlib-with-non-pic-code usr/lib/libGL.so.100.14.19
-nvidia-glx: shlib-with-non-pic-code usr/lib/libGLcore.so.100.14.19
-nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/modules/extensions/libglx.so.100.14.19
-nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/libXvMCNVIDIA.so.100.14.19
-nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/libXvMCNVIDIA.so.100.14.19
+nvidia-glx: shlib-with-non-pic-code usr/lib/libGL.so.169.07
+nvidia-glx: shlib-with-non-pic-code usr/lib/libGLcore.so.169.07
+nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/modules/extensions/libglx.so.169.07
+nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/libXvMCNVIDIA.so.169.07
+nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/libXvMCNVIDIA.so.169.07
-nvidia-glx: non-dev-pkg-with-shlib-symlink usr/lib/libGL.so.100.14.19 usr/lib/libGL.so
-nvidia-glx: non-dev-pkg-with-shlib-symlink usr/lib/xorg/modules/extensions/libglx.so.100.14.19 usr/lib/xorg/modules/extensions/libglx.so
+nvidia-glx: non-dev-pkg-with-shlib-symlink usr/lib/libGL.so.169.07 usr/lib/libGL.so
+nvidia-glx: non-dev-pkg-with-shlib-symlink usr/lib/xorg/modules/extensions/libglx.so.169.07 usr/lib/xorg/modules/extensions/libglx.so
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm?rev=340&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm Thu Jan 3 20:34:14 2008
@@ -30,7 +30,7 @@
dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libwfb.so.xserver-xorg-core /usr/lib/xorg/modules/libwfb.so > /dev/null
- rm -f /usr/lib/xorg/modules/extensions/libglx.so.100.14.19 2> /dev/null || true
+ rm -f /usr/lib/xorg/modules/extensions/libglx.so.169.07 2> /dev/null || true
if [ -d /usr/lib/nvidia ]; then
rmdir /usr/lib/nvidia/ || true;
fi
@@ -50,7 +50,7 @@
esac
-#rm -f /usr/lib/xorg/modules/extensions/libglx.so.100.14.19 2> /dev/null || true
+#rm -f /usr/lib/xorg/modules/extensions/libglx.so.169.07 2> /dev/null || true
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian?rev=340&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian Thu Jan 3 20:34:14 2008
@@ -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 xjvf nvidia-kernel.tar.bz2 -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 xjvf nvidia-kernel.tar.bz2 (if building in /usr/src)
The standard build location is /usr/src
@@ -98,7 +98,7 @@
7. Install the nvidia-kernel package:
- dpkg -i ../nvidia-kernel-2.6.14-2-k7_100.14.19-1+_.Custom_i386.deb
+ dpkg -i ../nvidia-kernel-2.6.14-2-k7_169.07-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 xjvf nvidia-kernel.tar.bz2 -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 xjvf nvidia-kernel.tar.bz2 (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
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian.in?rev=340&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian.in Thu Jan 3 20:34:14 2008
@@ -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 xjvf nvidia-kernel.tar.bz2 -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 xjvf nvidia-kernel.tar.bz2 (if building in /usr/src)
The standard build location is /usr/src
@@ -111,10 +111,10 @@
As root
1. cd /usr/src
- tar xzvf nvidia-kernel-source.tar.gz -C <YOUR BUILD LOCATION>
+ tar xjvf nvidia-kernel.tar.bz2 -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 xjvf nvidia-kernel.tar.bz2 (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
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.docs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.docs?rev=340&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.docs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.docs Thu Jan 3 20:34:14 2008
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-100.14.19-pkg2/usr/share/doc/NVIDIA_Changelog
-NVIDIA-Linux-x86_64-100.14.19-pkg2/usr/share/doc/README.txt
+NVIDIA-Linux-x86_64-169.07-pkg2/usr/share/doc/NVIDIA_Changelog
+NVIDIA-Linux-x86_64-169.07-pkg2/usr/share/doc/README.txt
Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=340&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Thu Jan 3 20:34:14 2008
@@ -22,6 +22,10 @@
url:=$(shell sh debian/upstream_info URL)
dirname:=$(shell sh debian/upstream_info DIRNAME)
filename:=$(shell sh debian/upstream_info FILENAME)
+filename_x86:=$(shell sh debian/upstream_info FILENAME_X86)
+filename_x86_64:=$(shell sh debian/upstream_info FILENAME_X86_64)
+dirname_x86:=$(shell sh debian/upstream_info DIRNAME_X86)
+dirname_x86_64:=$(shell sh debian/upstream_info DIRNAME_X86_64)
AUTOGEN=debian/nvidia-kernel-source.README.Debian debian/control \
debian/copyright debian/nvidia-glx.links debian/nvidia-glx-dev.links \
@@ -52,8 +56,9 @@
.PHONY: configure-stamp
configure-stamp: version-clean $(AUTOGEN)
dh_testdir
-
- ./${filename} --extract-only
+ # extract both so we can fetch the kernel object code for both arches
+ ./${filename_x86} --extract-only
+ ./${filename_x86_64} --extract-only
if false && test -d $(CURDIR)/patches; \
then \
pwd; \
@@ -101,9 +106,11 @@
done
chmod 755 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/patches
cp $(CURDIR)/$(dirname)/usr/src/nv/* $(CURDIR)/debian/temp/modules/nvidia-kernel/nv || true
+ cp $(CURDIR)/$(dirname_x86)/usr/src/nv/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o.x86 || true
+ cp $(CURDIR)/$(dirname_x86_64)/usr/src/nv/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o.x86_64 || true
chmod 755 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/rules
chown -R root:src $(CURDIR)/debian/temp/modules
- tar -zcvf $(CURDIR)/nvidia-kernel-source.tar.gz -C $(CURDIR)/debian/temp modules
+ tar -jcvf $(CURDIR)/nvidia-kernel.tar.bz2 -C $(CURDIR)/debian/temp modules
rm -rf debian/temp
touch build-kernel-stamp
@@ -114,7 +121,7 @@
rm -f build-stamp build-kernel-stamp configure-stamp
dh_clean
- rm -fr $(dirname) nvidia-kernel-source.tar.gz
+ rm -fr $(dirname_x86) $(dirname_x86_64) nvidia-kernel.tar.bz2
@@ -125,7 +132,7 @@
dh_clean -k
dh_installdirs
- install -m 644 $(CURDIR)/nvidia-kernel-source.tar.gz $(CURDIR)/debian/nvidia-kernel-source/usr/src
+ install -m 644 $(CURDIR)/nvidia-kernel.tar.bz2 $(CURDIR)/debian/nvidia-kernel-source/usr/src
install -m 0644 $(dirname)/usr/X11R6/lib/modules/drivers/nvidia_drv.so \
Modified: packages/nvidia-graphics-drivers/trunk/debian/upstream_info
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/upstream_info?rev=340&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/upstream_info (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/upstream_info Thu Jan 3 20:34:14 2008
@@ -1,8 +1,8 @@
eval `dpkg-architecture`
#BASE_VERSION=1.0
-RELEASE=100.14.19
-NEXTVER=100.14.20
+RELEASE=169.07
+NEXTVER=169.08
if [ "$DEB_BUILD_ARCH" = "amd64" ] ; then
BASE_URL=ftp://download.nvidia.com/XFree86/Linux-x86_64/${RELEASE}
@@ -17,7 +17,10 @@
echo "huh? dont know about a version of this driver for your architecture."
exit 1
fi
-
+FILENAME_X86=NVIDIA-Linux-x86-${RELEASE}-pkg0.run
+FILENAME_X86_64=NVIDIA-Linux-x86_64-${RELEASE}-pkg2.run
+DIRNAME_X86=NVIDIA-Linux-x86-${RELEASE}-pkg0
+DIRNAME_X86_64=NVIDIA-Linux-x86_64-${RELEASE}-pkg2
VERSION=${RELEASE}
UPSTREAMVERSION=${RELEASE}
@@ -42,6 +45,18 @@
FILENAME)
echo "$FILENAME"
;;
+ FILENAME_X86_64)
+ echo "$FILENAME_X86_64"
+ ;;
+ FILENAME_X86)
+ echo "$FILENAME_X86"
+ ;;
+ DIRNAME_X86_64)
+ echo "$DIRNAME_X86_64"
+ ;;
+ DIRNAME_X86)
+ echo "$DIRNAME_X86"
+ ;;
DIRNAME)
echo "$DIRNAME"
;;
More information about the Pkg-nvidia-devel
mailing list