[pkg-nvidia-devel] r1081 - in /packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian: ./ module/debian/patches/

[anbe-guest at users.alioth.debian.org]

Author: anbe-guest
Date: Thu Jun 10 11:32:49 2010
New Revision: 1081

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1081
Log:
refresh patches

Removed:
    packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/NVIDIA_kernel-195.36.24-682377.diff
Modified:
    packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog
    packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/conditionally-include-linux_version.h.patch
    packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/select-nv-kernel.o.ARCH.patch
    packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/series

Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog?rev=1081&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog Thu Jun 10 11:32:49 2010
@@ -14,6 +14,7 @@
     - overhaul copyright, READMEs and other documentation
   * no longer include the cuda libraries/headers in nvidia-glx*
   * update nvidia.ids
+  * refresh patches
 
  -- Andreas Beckmann <debian at abeckmann.de>  Mon, 07 Jun 2010 13:19:30 +0200
 

Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/conditionally-include-linux_version.h.patch
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/conditionally-include-linux_version.h.patch?rev=1081&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/conditionally-include-linux_version.h.patch (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/conditionally-include-linux_version.h.patch Thu Jun 10 11:32:49 2010
@@ -5,12 +5,12 @@
  Since linux/version.h does not contain include guards, add a check to
  nv-linux.h to not include linux/version.h multiple times.
 
-Index: b/nv-linux.h
+Index: nvidia-173.14.25/nv-linux.h
 ===================================================================
---- a/nv-linux.h	2010-04-23 05:40:40.000000000 +0200
-+++ b/nv-linux.h	2010-04-27 10:21:53.475537265 +0200
-@@ -23,7 +23,9 @@
- #endif
+--- nvidia-173.14.25.orig/nv-linux.h	2010-01-28 11:35:34.000000000 +0100
++++ nvidia-173.14.25/nv-linux.h	2010-06-10 13:22:44.416037156 +0200
+@@ -21,7 +21,9 @@
+ #include <linux/autoconf.h>
  #endif
  
 +#ifndef LINUX_VERSION_CODE

Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/select-nv-kernel.o.ARCH.patch
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/select-nv-kernel.o.ARCH.patch?rev=1081&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/select-nv-kernel.o.ARCH.patch (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/select-nv-kernel.o.ARCH.patch Thu Jun 10 11:32:49 2010
@@ -7,16 +7,16 @@
  This was previously done by a 'sed' command when building the module source
  tarball.
 
-Index: b/Makefile.kbuild
+Index: nvidia-173.14.25/Makefile.kbuild
 ===================================================================
---- a/Makefile.kbuild	2010-04-24 01:54:44.284537241 +0200
-+++ b/Makefile.kbuild	2010-04-24 02:31:36.799037816 +0200
+--- nvidia-173.14.25.orig/Makefile.kbuild	2010-01-28 11:35:36.000000000 +0100
++++ nvidia-173.14.25/Makefile.kbuild	2010-06-10 13:22:08.219537677 +0200
 @@ -44,7 +44,7 @@
  # understands that we want a module.
  #
  
 -CORE_OBJS := nv-kernel.o
 +CORE_OBJS := nv-kernel.o$(NVARCH)
- RESMAN_GLUE_OBJS := nv.o nv_gvi.o nv-vm.o os-agp.o os-interface.o os-registry.o nv-i2c.o nvacpi.o
+ RESMAN_GLUE_OBJS := nv.o nv-vm.o os-agp.o os-interface.o os-registry.o nv-i2c.o nvacpi.o
  
  $(MODULE_NAME)-objs := $(CORE_OBJS) $(RESMAN_GLUE_OBJS)

Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/series?rev=1081&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/series (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/series Thu Jun 10 11:32:49 2010
@@ -1,3 +1,2 @@
-NVIDIA_kernel-195.36.24-682377.diff
 select-nv-kernel.o.ARCH.patch
 conditionally-include-linux_version.h.patch