Merge lp:~computersforpeace/ubuntu/utopic/nvidia-graphics-drivers-331/fix-for-1367468 into lp:ubuntu/utopic/nvidia-graphics-drivers-331

[Brian Norris]

Update nvidia-331 package to build on 3.17 kernel (LP #1367468)

Unmerged revisions

24. By Brian Norris on 2014-09-13

* debian/dkms_nvidia/patches/buildfix_kernel_3.17.patch:
  - Drop <acpi/acpi.h> header; it was never needed
* debian/templates/dkms_nvidia.conf.in
  - Add patch for 3.17 (applicable to all kernels)

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-12 16:34:08 +0000
+++ debian/changelog	2014-09-13 06:20:26 +0000
@@ -1,3 +1,12 @@
+nvidia-graphics-drivers-331 (331.89-0ubuntu5) UNRELEASED; urgency=medium
+
+  * debian/dkms_nvidia/patches/buildfix_kernel_3.17.patch:
+    - Drop <acpi/acpi.h> header; it was never needed
+  * debian/templates/dkms_nvidia.conf.in
+    - Add patch for 3.17 (applicable to all kernels)
+
+ -- Brian Norris <[e-mail]>  Fri, 12 Sep 2014 23:09:28 -0700
+
 nvidia-graphics-drivers-331 (331.89-0ubuntu4) utopic; urgency=medium
 
   [ Alberto Milone ]

=== added file 'debian/dkms_nvidia/patches/buildfix_kernel_3.17.patch'
--- debian/dkms_nvidia/patches/buildfix_kernel_3.17.patch	1970-01-01 00:00:00 +0000
+++ debian/dkms_nvidia/patches/buildfix_kernel_3.17.patch	2014-09-13 06:20:26 +0000
@@ -0,0 +1,12 @@
+diff --git a/nv-linux.h b/nv-linux.h
+index 7825518bd014..43f413757beb 100644
+--- a/nv-linux.h
++++ b/nv-linux.h
+@@ -266,7 +266,6 @@ extern int nv_pat_mode;
+ #endif
+ 
+ #if !defined(NV_VMWARE) && defined(CONFIG_ACPI)
+-#include <acpi/acpi.h>
+ #include <linux/acpi.h>
+ #include <acpi/acpi_drivers.h>
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)

=== modified file 'debian/templates/dkms_nvidia.conf.in'
--- debian/templates/dkms_nvidia.conf.in	2014-06-05 10:39:19 +0000
+++ debian/templates/dkms_nvidia.conf.in	2014-09-13 06:20:26 +0000
@@ -12,3 +12,4 @@
 #PATCH_MATCH[1]="^3.[10-11]"
 #PATCH[0]="buildfix_kernel_3.14.patch"
 #PATCH[1]="register-VT-switch-requirements.patch"
+#PATCH[2]="buildfix_kernel_3.17.patch"