Tags: patch

Hi all,

Please find attached a debdiff that patches the debian source of
nvidia-graphics-drivers 195.36.24 to work with 256.44. Works for me, hope
this helps the nvidia team or others.

Cheers

Jan-Pascal
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/changelog nvidia-graphics-drivers-256.44/debian/changelog
--- nvidia-graphics-drivers-195.36.24/debian/changelog	2010-06-14 04:50:46.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/changelog	2010-08-04 10:25:50.000000000 +0200
@@ -1,3 +1,9 @@
+nvidia-graphics-drivers (256.44-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jan-Pascal van Best <janpas...@vanbest.org>  Wed, 04 Aug 2010 10:25:24 +0200
+
 nvidia-graphics-drivers (195.36.24-4) unstable; urgency=low
 
   * Remove the conflicts with ccache in nvidia-kernel-source and
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/libcuda1-dev.install nvidia-graphics-drivers-256.44/debian/libcuda1-dev.install
--- nvidia-graphics-drivers-195.36.24/debian/libcuda1-dev.install	2010-05-23 03:19:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/libcuda1-dev.install	2010-08-04 12:55:06.000000000 +0200
@@ -1,2 +1,2 @@
-usr/include/cuda/cuda.h
-usr/include/cuda/cudaGL.h
+cuda.h
+cudaGL.h
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/libcuda1-ia32.install.in nvidia-graphics-drivers-256.44/debian/libcuda1-ia32.install.in
--- nvidia-graphics-drivers-195.36.24/debian/libcuda1-ia32.install.in	2010-05-23 03:19:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/libcuda1-ia32.install.in	2010-08-04 17:25:40.000000000 +0200
@@ -1 +1 @@
-usr/lib32/libcuda.so.#VERSION#
+32/libcuda.so.#VERSION# usr/lib32/
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/libcuda1.install.in nvidia-graphics-drivers-256.44/debian/libcuda1.install.in
--- nvidia-graphics-drivers-195.36.24/debian/libcuda1.install.in	2010-05-23 03:19:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/libcuda1.install.in	2010-08-04 16:06:57.000000000 +0200
@@ -1 +1 @@
-usr/lib/libcuda.so.#VERSION#
+libcuda.so.#VERSION#  usr/lib/
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/libnvidia-compiler1-ia32.install.in nvidia-graphics-drivers-256.44/debian/libnvidia-compiler1-ia32.install.in
--- nvidia-graphics-drivers-195.36.24/debian/libnvidia-compiler1-ia32.install.in	2010-05-23 03:19:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/libnvidia-compiler1-ia32.install.in	2010-08-04 12:48:33.000000000 +0200
@@ -1 +1 @@
-usr/lib32/libnvidia-compiler.so.#VERSION#
+32/libnvidia-compiler.so.#VERSION#
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/libnvidia-compiler1.install.in nvidia-graphics-drivers-256.44/debian/libnvidia-compiler1.install.in
--- nvidia-graphics-drivers-195.36.24/debian/libnvidia-compiler1.install.in	2010-05-23 03:19:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/libnvidia-compiler1.install.in	2010-08-04 16:04:58.000000000 +0200
@@ -1 +1 @@
-usr/lib/libnvidia-compiler.so.#VERSION#
+libnvidia-compiler.so.#VERSION# usr/lib/
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/module/debian/patches/NVIDIA_kernel-195.36.24-682377.diff nvidia-graphics-drivers-256.44/debian/module/debian/patches/NVIDIA_kernel-195.36.24-682377.diff
--- nvidia-graphics-drivers-195.36.24/debian/module/debian/patches/NVIDIA_kernel-195.36.24-682377.diff	2010-05-23 03:19:35.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/module/debian/patches/NVIDIA_kernel-195.36.24-682377.diff	1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-Description: Another vga arbiter fix for supporting more than one GPU with kernel 2.6.32
-Origin: upstream, http://www.nvnews.net/vbulletin/attachment.php?attachmentid=40165&d=1272937909
-Bug: http://www.nvnews.net/vbulletin/showthread.php?p=2243704
-Bug-Debian: http://bugs.debian.org/566874
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nvidia-graphics-drivers/+bug/548362
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nvidia-graphics-drivers/+bug/573557
-
-diff -ru usr/src/nv/nv.c usr/src/nv.682377/nv.c
---- a/nv.c	2010-04-22 11:49:41.000000000 -0700
-+++ b/nv.c	2010-05-03 15:24:45.330672559 -0700
-@@ -4749,6 +4749,9 @@
-     pci_set_master(dev);
- 
- #if defined(CONFIG_VGA_ARB)
-+#if defined(VGA_DEFAULT_DEVICE)
-+    vga_tryget(VGA_DEFAULT_DEVICE, VGA_RSRC_LEGACY_MASK);
-+#endif
-     vga_set_legacy_decoding(dev, VGA_RSRC_NONE);
- #endif
- 
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/module/debian/patches/series nvidia-graphics-drivers-256.44/debian/module/debian/patches/series
--- nvidia-graphics-drivers-195.36.24/debian/module/debian/patches/series	2010-05-23 03:19:35.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/module/debian/patches/series	2010-08-04 11:04:11.000000000 +0200
@@ -1,3 +1,2 @@
-NVIDIA_kernel-195.36.24-682377.diff
 select-nv-kernel.o.ARCH.patch
 conditionally-include-linux_version.h.patch
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/nvidia-glx-dev.install.in nvidia-graphics-drivers-256.44/debian/nvidia-glx-dev.install.in
--- nvidia-graphics-drivers-195.36.24/debian/nvidia-glx-dev.install.in	2010-06-04 04:27:05.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/nvidia-glx-dev.install.in	2010-08-04 12:42:29.000000000 +0200
@@ -1,5 +1,5 @@
-usr/include/GL/gl.h		usr/include/nvidia/GL/
-usr/include/GL/glext.h		usr/include/nvidia/GL/
-usr/include/GL/glx.h		usr/include/nvidia/GL/
-usr/include/GL/glxext.h		usr/include/nvidia/GL/
-usr/X11R6/lib/libXvMCNVIDIA.a	usr/lib/
+gl.h		usr/include/nvidia/GL/
+glext.h		usr/include/nvidia/GL/
+glx.h		usr/include/nvidia/GL/
+glxext.h	usr/include/nvidia/GL/
+libXvMCNVIDIA.a	usr/lib/
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/nvidia-glx.docs nvidia-graphics-drivers-256.44/debian/nvidia-glx.docs
--- nvidia-graphics-drivers-195.36.24/debian/nvidia-glx.docs	2010-05-23 03:19:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/nvidia-glx.docs	2010-08-04 15:09:09.000000000 +0200
@@ -1 +1 @@
-debian/tmp/usr/share/doc/README.txt
+debian/tmp/README.txt
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/nvidia-glx.examples nvidia-graphics-drivers-256.44/debian/nvidia-glx.examples
--- nvidia-graphics-drivers-195.36.24/debian/nvidia-glx.examples	2010-06-13 03:22:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/nvidia-glx.examples	2010-08-04 15:12:12.000000000 +0200
@@ -1 +1 @@
-debian/tmp/usr/share/doc/xorg.conf.sample
+#debian/tmp/usr/share/doc/xorg.conf.sample
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/nvidia-glx-ia32.install.in nvidia-graphics-drivers-256.44/debian/nvidia-glx-ia32.install.in
--- nvidia-graphics-drivers-195.36.24/debian/nvidia-glx-ia32.install.in	2010-05-23 03:19:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/nvidia-glx-ia32.install.in	2010-08-04 17:25:23.000000000 +0200
@@ -1,4 +1,5 @@
-usr/lib32/libGL.so.#VERSION#
-usr/lib32/libGLcore.so.#VERSION#
-usr/lib32/libnvidia-tls.so.#VERSION#
-usr/lib32/tls/libnvidia-tls.so.#VERSION#
+32/libGL.so.#VERSION# usr/lib32/
+#32/libGLcore.so.#VERSION#
+32/libnvidia-glcore.so.#VERSION# usr/lib32/
+32/libnvidia-tls.so.#VERSION# usr/lib32/
+32/tls/libnvidia-tls.so.#VERSION# usr/lib32/tls/
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/nvidia-glx.install.in nvidia-graphics-drivers-256.44/debian/nvidia-glx.install.in
--- nvidia-graphics-drivers-195.36.24/debian/nvidia-glx.install.in	2010-06-13 03:22:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/nvidia-glx.install.in	2010-08-04 15:49:20.000000000 +0200
@@ -1,10 +1,11 @@
-usr/bin/nvidia-bug-report.sh
-usr/lib/libGL.so.#VERSION#
-usr/lib/libGLcore.so.#VERSION#
-usr/lib/libnvidia-cfg.so.#VERSION#
-usr/lib/libnvidia-tls.so.#VERSION#
-usr/lib/tls/libnvidia-tls.so.#VERSION#
-usr/X11R6/lib/libXvMCNVIDIA.so.#VERSION#		usr/lib/
-usr/X11R6/lib/modules/drivers/nvidia_drv.so		usr/lib/xorg/modules/drivers/
-usr/X11R6/lib/modules/extensions/libglx.so.#VERSION#	usr/lib/xorg/modules/extensions/
+nvidia-bug-report.sh usr/bin/
+libGL.so.#VERSION# usr/lib/
+#libGLcore.so.#VERSION#
+libnvidia-glcore.so.#VERSION# usr/lib/
+libnvidia-cfg.so.#VERSION# usr/lib/
+libnvidia-tls.so.#VERSION# usr/lib/
+tls/libnvidia-tls.so.#VERSION# usr/lib/tls/
+libXvMCNVIDIA.so.#VERSION#  usr/lib/
+nvidia_drv.so		usr/lib/xorg/modules/drivers/
+libglx.so.#VERSION#	usr/lib/xorg/modules/extensions/
 debian/nvidia.ids					usr/share/xserver-xorg/pci/
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/nvidia-glx.links.in nvidia-graphics-drivers-256.44/debian/nvidia-glx.links.in
--- nvidia-graphics-drivers-195.36.24/debian/nvidia-glx.links.in	2010-06-04 04:27:05.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/nvidia-glx.links.in	2010-08-04 16:00:32.000000000 +0200
@@ -1,5 +1,5 @@
 usr/lib/libGL.so.#VERSION#				usr/lib/libGL.so.1
-usr/lib/libGLcore.so.#VERSION#				usr/lib/libGLcore.so.1
+usr/lib/libnvidia-glcore.so.#VERSION#				usr/lib/libGLcore.so.1
 usr/lib/libnvidia-cfg.so.#VERSION#			usr/lib/libnvidia-cfg.so.1
 usr/lib/libnvidia-tls.so.#VERSION#			usr/lib/libnvidia-tls.so.1
 usr/lib/tls/libnvidia-tls.so.#VERSION#			usr/lib/tls/libnvidia-tls.so.1
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/nvidia.ids nvidia-graphics-drivers-256.44/debian/nvidia.ids
--- nvidia-graphics-drivers-195.36.24/debian/nvidia.ids	2010-06-13 03:22:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/nvidia.ids	2010-08-04 10:38:06.000000000 +0200
@@ -129,6 +129,10 @@
 10DE05E3
 10DE05E6
 10DE05E7
+10DE0595
+10DE068F
+10DE0697
+10DE0743
 10DE05EA
 10DE05EB
 10DE0600
@@ -188,8 +192,11 @@
 10DE0656
 10DE065B
 10DE06C0
+10DE06C4
+10DE06CA
 10DE06CD
 10DE06D1
+10DE06DE
 10DE06E0
 10DE06E1
 10DE06E2
@@ -244,6 +251,7 @@
 10DE087E
 10DE087F
 10DE0A20
+10DE0A22
 10DE0A23
 10DE0A28
 10DE0A29
@@ -258,6 +266,7 @@
 10DE0A64
 10DE0A65
 10DE0A66
+10DE0A67
 10DE0A68
 10DE0A69
 10DE0A6E
@@ -275,9 +284,12 @@
 10DE0CA7
 10DE0CA8
 10DE0CA9
+10DE0CAC
 10DE0CAF
 10DE0CB0
 10DE0CB1
+10DE0E22
+10DE0E24
 10DE004E
 10DE009D
 10DE00CC
@@ -335,6 +347,9 @@
 10DE0659
 10DE065A
 10DE065C
+10DE06D8
+10DE06D9
+10DE06DD
 10DE06EA
 10DE06EB
 10DE06F8
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/nvidia-kernel-source.docs nvidia-graphics-drivers-256.44/debian/nvidia-kernel-source.docs
--- nvidia-graphics-drivers-195.36.24/debian/nvidia-kernel-source.docs	2010-05-23 03:19:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/nvidia-kernel-source.docs	2010-08-04 15:09:13.000000000 +0200
@@ -1 +1 @@
-debian/tmp/usr/share/doc/README.txt
+debian/tmp/README.txt
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/nvidia-libopencl1-dev.install nvidia-graphics-drivers-256.44/debian/nvidia-libopencl1-dev.install
--- nvidia-graphics-drivers-195.36.24/debian/nvidia-libopencl1-dev.install	2010-05-23 03:19:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/nvidia-libopencl1-dev.install	2010-08-04 15:03:00.000000000 +0200
@@ -1 +1 @@
-usr/include/CL
+cl*.h usr/include/CL
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/nvidia-libopencl1-ia32.install nvidia-graphics-drivers-256.44/debian/nvidia-libopencl1-ia32.install
--- nvidia-graphics-drivers-195.36.24/debian/nvidia-libopencl1-ia32.install	2010-05-23 03:19:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/nvidia-libopencl1-ia32.install	2010-08-04 14:59:34.000000000 +0200
@@ -1 +1 @@
-usr/lib32/libOpenCL.so.1.0.0
+32/libOpenCL.so.1.0.0 /usr/lib32/
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/nvidia-libopencl1.install nvidia-graphics-drivers-256.44/debian/nvidia-libopencl1.install
--- nvidia-graphics-drivers-195.36.24/debian/nvidia-libopencl1.install	2010-05-23 03:19:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/nvidia-libopencl1.install	2010-08-04 14:57:37.000000000 +0200
@@ -1 +1 @@
-usr/lib/libOpenCL.so.1.0.0
+libOpenCL.so.1.0.0 /usr/lib/
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/nvidia-opencl-common.install nvidia-graphics-drivers-256.44/debian/nvidia-opencl-common.install
--- nvidia-graphics-drivers-195.36.24/debian/nvidia-opencl-common.install	2010-05-23 03:19:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/nvidia-opencl-common.install	2010-08-04 12:58:02.000000000 +0200
@@ -1 +1 @@
-etc/OpenCL/vendors/nvidia.icd
+nvidia.icd etc/OpenCL/vendors/
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/nvidia-vdpau-driver.docs nvidia-graphics-drivers-256.44/debian/nvidia-vdpau-driver.docs
--- nvidia-graphics-drivers-195.36.24/debian/nvidia-vdpau-driver.docs	2010-05-23 03:19:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/nvidia-vdpau-driver.docs	2010-08-04 15:09:18.000000000 +0200
@@ -1 +1 @@
-debian/tmp/usr/share/doc/README.txt
+debian/tmp/README.txt
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/nvidia-vdpau-driver-ia32.docs nvidia-graphics-drivers-256.44/debian/nvidia-vdpau-driver-ia32.docs
--- nvidia-graphics-drivers-195.36.24/debian/nvidia-vdpau-driver-ia32.docs	2010-05-23 03:19:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/nvidia-vdpau-driver-ia32.docs	2010-08-04 15:09:24.000000000 +0200
@@ -1 +1 @@
-debian/tmp/usr/share/doc/README.txt
+debian/tmp/README.txt
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/nvidia-vdpau-driver-ia32.install.in nvidia-graphics-drivers-256.44/debian/nvidia-vdpau-driver-ia32.install.in
--- nvidia-graphics-drivers-195.36.24/debian/nvidia-vdpau-driver-ia32.install.in	2010-05-23 03:19:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/nvidia-vdpau-driver-ia32.install.in	2010-08-04 17:24:49.000000000 +0200
@@ -1 +1 @@
-usr/lib32/vdpau/libvdpau_nvidia.so.#VERSION#
+32/libvdpau_nvidia.so.#VERSION# usr/lib32/vdpau/
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/nvidia-vdpau-driver.install.in nvidia-graphics-drivers-256.44/debian/nvidia-vdpau-driver.install.in
--- nvidia-graphics-drivers-195.36.24/debian/nvidia-vdpau-driver.install.in	2010-05-23 03:19:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/nvidia-vdpau-driver.install.in	2010-08-04 16:03:03.000000000 +0200
@@ -1 +1 @@
-usr/lib/vdpau/libvdpau_nvidia.so.#VERSION#
+libvdpau_nvidia.so.#VERSION#  usr/lib/vdpau/
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/rules nvidia-graphics-drivers-256.44/debian/rules
--- nvidia-graphics-drivers-195.36.24/debian/rules	2010-06-13 04:31:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/rules	2010-08-04 16:58:43.000000000 +0200
@@ -2,6 +2,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
@@ -48,7 +49,7 @@
 
 nvidia.ids: unpack-stamp
 	sed -e '/^A1/,/^Below/{/ 0x/s/.* 0x\([0-9a-fA-F]\{4\}\).*/10DE\1/p};d' \
-		NVIDIA-Linux-$(DEB_HOST_ARCH)/usr/share/doc/README.txt \
+		NVIDIA-Linux-$(DEB_HOST_ARCH)/README.txt \
 		> $@
 	if ! cmp -s debian/nvidia.ids nvidia.ids ; then \
 		diff -u debian/nvidia.ids nvidia.ids || true ; \
@@ -82,17 +83,17 @@
 	cp -al NVIDIA-Linux-$(DEB_HOST_ARCH)/ debian/tmp
 
 	# Create xorg.conf.sample
-	sed \
-	    -e 's/XF86Config(4\/5)/xorg.conf(5)/g' \
-	    -e 's/XF86Config/xorg.conf/g' \
-	    -e 's/XFree86/Xorg/g' \
-	    < debian/tmp/usr/share/doc/XF86Config.sample \
-	    > debian/tmp/usr/share/doc/xorg.conf.sample
+	#sed \
+	#    -e 's/XF86Config(4\/5)/xorg.conf(5)/g' \
+	#    -e 's/XF86Config/xorg.conf/g' \
+	#    -e 's/XFree86/Xorg/g' \
+	#    < debian/tmp/usr/share/doc/XF86Config.sample \
+	#    > debian/tmp/usr/share/doc/xorg.conf.sample
 
 	# Build the nvidia-kernel-source tree.
 	mkdir -p $(module_source)
-	mv debian/tmp/usr/src/nv/* $(module_source)/
-	cp -a debian/tmp/usr/share/doc/NVIDIA_Changelog $(module_source)/
+	mv debian/tmp/kernel/* $(module_source)/
+	cp -a debian/tmp/NVIDIA_Changelog $(module_source)/
 
 	# We don't want these makefiles that don't work with kbuild.
 	rm $(module_source)/makefile
@@ -101,9 +102,9 @@
 	# We want both 32 and 64 bit versions of nv-kernel.o.  Do not use a
 	# name matching *.o to prevent accidental deletion by some clean
 	# target.
-	cp -a NVIDIA-Linux-i386/usr/src/nv/nv-kernel.o \
+	cp -a NVIDIA-Linux-i386/kernel/nv-kernel.o \
 	    $(module_source)/nv-kernel.o.i386
-	cp -a NVIDIA-Linux-amd64/usr/src/nv/nv-kernel.o \
+	cp -a NVIDIA-Linux-amd64/kernel/nv-kernel.o \
 	    $(module_source)/nv-kernel.o.x86_64
 	rm -f $(module_source)/nv-kernel.o
 
@@ -139,13 +140,13 @@
 	dh_install --list-missing
 
 override_dh_installchangelogs:
-	dh_installchangelogs debian/tmp/usr/share/doc/NVIDIA_Changelog
+	dh_installchangelogs debian/tmp/NVIDIA_Changelog
 
 override_dh_bugfiles:
 	dh_bugfiles -A
 
 override_dh_makeshlibs:
-	dh_makeshlibs -Xusr/lib/vdpau
+	dh_makeshlibs -Xusr/lib/vdpau -- -V -d -c0
 
 override_dh_gencontrol:
 	dh_gencontrol -- -V'nvidia:Version=$(version)' -V'nvidia:Legacy=$(legacy)' \
@@ -190,11 +191,11 @@
 
 .PHONY: get-orig-source
 get-orig-source:
-	rm -rf get-orig-source || true
-	mkdir get-orig-source
-	uscan --no-symlink --download-current-version --pasv \
-	    --destdir get-orig-source
-	test `ls get-orig-source/* | wc -l` = 2  # we need exactly 2 downloaded files
+	#rm -rf get-orig-source || true
+	#mkdir get-orig-source
+	#uscan --no-symlink --download-current-version --pasv \
+	#    --destdir get-orig-source
+	#test `ls get-orig-source/* | wc -l` = 1  # we need exactly 2 downloaded files
 	@set -e -x ; \
 	    cd get-orig-source ; \
 	    newversion=$$(ls *-x86-*.run | sed -e 's/.*-\([0-9.]*\)\(-.*\)\?\.run/\1/') ; \
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/rules.defs nvidia-graphics-drivers-256.44/debian/rules.defs
--- nvidia-graphics-drivers-195.36.24/debian/rules.defs	2010-06-13 03:22:36.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/rules.defs	2010-08-04 10:36:21.000000000 +0200
@@ -1,9 +1,9 @@
 
-NVIDIA_RELEASE		 = 195.36.24
+NVIDIA_RELEASE		 = 256.44
 NVIDIA_LEGACY		 =
-WATCH_PATTERN		 = 195\.[\d\.\-]+
+WATCH_PATTERN		 = 256\.[\d\.\-]+
 
-NVIDIA_DIRNAME_X86	 = NVIDIA-Linux-x86-${NVIDIA_RELEASE}-pkg0
-NVIDIA_DIRNAME_X86_64	 = NVIDIA-Linux-x86_64-${NVIDIA_RELEASE}-pkg2
+NVIDIA_DIRNAME_X86	 = NVIDIA-Linux-x86-${NVIDIA_RELEASE}
+NVIDIA_DIRNAME_X86_64	 = NVIDIA-Linux-x86_64-${NVIDIA_RELEASE}
 NVIDIA_FILENAME_X86	 = ${NVIDIA_DIRNAME_X86}.run
 NVIDIA_FILENAME_X86_64	 = ${NVIDIA_DIRNAME_X86_64}.run
diff -Nru --exclude '*.run' nvidia-graphics-drivers-195.36.24/debian/watch nvidia-graphics-drivers-256.44/debian/watch
--- nvidia-graphics-drivers-195.36.24/debian/watch	2010-06-13 04:24:18.000000000 +0200
+++ nvidia-graphics-drivers-256.44/debian/watch	2010-08-04 10:36:24.000000000 +0200
@@ -1,5 +1,5 @@
 # ftp://download.nvidia.com/XFree86/Linux-x86_64/190.36/NVIDIA-Linux-x86_64-190.36-pkg2.run
 # ftp://download.nvidia.com/XFree86/Linux-x86_64/256.29/NVIDIA-Linux-x86_64-256.29.run
 version=3
-ftp://download.nvidia.com/XFree86/Linux-x86/(195\.[\d\.\-]+)/NVIDIA-Linux-x86-([\d\.\-]+)(?:-pkg0)?\.run
-ftp://download.nvidia.com/XFree86/Linux-x86_64/(195\.[\d\.\-]+)/NVIDIA-Linux-x86_64-([\d\.\-]+)(?:-pkg2)?\.run
+ftp://download.nvidia.com/XFree86/Linux-x86/(256\.[\d\.\-]+)/NVIDIA-Linux-x86-([\d\.\-]+)(?:-pkg0)?\.run
+ftp://download.nvidia.com/XFree86/Linux-x86_64/(256\.[\d\.\-]+)/NVIDIA-Linux-x86_64-([\d\.\-]+)(?:-pkg2)?\.run

Reply via email to