[pkg-nvidia-devel] r854 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog module/conftest.h module/debian/patches/conditionally-include-linux_version.h.patch module/debian/patches/series

[rra at users.alioth.debian.org]

Author: rra
Date: Sat May  8 03:32:35 2010
New Revision: 854

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=854
Log:
Fix inclusion of linux/version.h in conftest.h

[ Andreas Beckmann ]
* conftest.h: ensure the macros from linux/version.h are available
* debian/module/debian/patches/conditionally-include-linux_version.h.patch:
  new patch, ensure linux/version.h is included only once (that header does
  not have include guards)

Added:
    packages/nvidia-graphics-drivers/trunk/debian/module/debian/patches/conditionally-include-linux_version.h.patch
Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/module/conftest.h
    packages/nvidia-graphics-drivers/trunk/debian/module/debian/patches/series

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=854&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sat May  8 03:32:35 2010
@@ -86,6 +86,10 @@
   * debian/module/debian/: set source format 1.0, the module source "package"
     is shipped as .tar.bz2 and unpacked with tar, therefore no newer features
     can be used
+  * conftest.h: ensure the macros from linux/version.h are available
+  * debian/module/debian/patches/conditionally-include-linux_version.h.patch:
+    new patch, ensure linux/version.h is included only once (that header does
+    not have include guards)
 
  -- Russ Allbery <rra at debian.org>  Sat, 24 Apr 2010 20:35:20 -0700
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/module/conftest.h
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/module/conftest.h?rev=854&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/module/conftest.h (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/module/conftest.h Sat May  8 03:32:35 2010
@@ -1,3 +1,7 @@
+#ifndef LINUX_VERSION_CODE
+#include <linux/version.h>
+#endif
+
 /* Implement conftest.sh function remap_page_range */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)

Added: packages/nvidia-graphics-drivers/trunk/debian/module/debian/patches/conditionally-include-linux_version.h.patch
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/module/debian/patches/conditionally-include-linux_version.h.patch?rev=854&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/module/debian/patches/conditionally-include-linux_version.h.patch (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/module/debian/patches/conditionally-include-linux_version.h.patch Sat May  8 03:32:35 2010
@@ -1,0 +1,21 @@
+Author: Andreas Beckmann <debian at abeckmann.de>
+Description: Conditionally include linux/version.h
+ Starting with 195.xx the include order in nv-linux.h was changed and
+ therefore our conftest.h needs to include linux/version.h itself.
+ 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
+===================================================================
+--- a/nv-linux.h	2009-12-10 01:41:16.000000000 +0100
++++ b/nv-linux.h	2010-04-27 10:21:53.475537265 +0200
+@@ -17,7 +17,9 @@
+ #ifndef AUTOCONF_INCLUDED
+ #include <linux/autoconf.h>
+ #endif
++#ifndef LINUX_VERSION_CODE
+ #include <linux/version.h>
++#endif
+ #include <linux/utsname.h>
+ 
+ 

Modified: packages/nvidia-graphics-drivers/trunk/debian/module/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/module/debian/patches/series?rev=854&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/module/debian/patches/series (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/module/debian/patches/series Sat May  8 03:32:35 2010
@@ -1,2 +1,3 @@
 select-nv-kernel.o.ARCH.patch
+conditionally-include-linux_version.h.patch
 fix-2.6.33-build.patch