[Pkg-fglrx-devel] r342 - in fglrx-driver/trunk/debian: . patches

[Patrick Matthäi]

Author: pmatthaei
Date: 2009-11-23 09:13:32 +0000 (Mon, 23 Nov 2009)
New Revision: 342

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/01-CONFIG_X86_XEN.diff
Log:
* Rediff hunky 01-CONFIG_X86_XEN patch. This fixes a FTBFS.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2009-11-22 16:36:24 UTC (rev 341)
+++ fglrx-driver/trunk/debian/changelog	2009-11-23 09:13:32 UTC (rev 342)
@@ -3,8 +3,9 @@
   * Applied patch from Daniel Schaal, which only adds the fglrx module for one
     time to dkms.
     Closes: #557316
+  * Rediff hunky 01-CONFIG_X86_XEN patch. This fixes a FTBFS.
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 22 Nov 2009 17:35:03 +0100
+ -- Patrick Matthäi <pmatthaei at debian.org>  Mon, 23 Nov 2009 10:12:51 +0100
 
 fglrx-driver (1:9-11-1) unstable; urgency=low
 

Modified: fglrx-driver/trunk/debian/patches/01-CONFIG_X86_XEN.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/01-CONFIG_X86_XEN.diff	2009-11-22 16:36:24 UTC (rev 341)
+++ fglrx-driver/trunk/debian/patches/01-CONFIG_X86_XEN.diff	2009-11-23 09:13:32 UTC (rev 342)
@@ -1,17 +1,17 @@
 # Adds support for XEN.
 
-diff -Naur fglrx-driver-8-12.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-8-12/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-8-12.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2008-12-10 19:27:58.000000000 +0100
-+++ fglrx-driver-8-12/common/lib/modules/fglrx/build_mod/firegl_public.c	2008-12-14 13:44:52.000000000 +0100
-@@ -31,6 +31,7 @@
- #include <linux/autoconf.h>
+diff -Naur fglrx-driver-9-11.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-9-11/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-9-11.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2009-11-23 10:08:55.000000000 +0100
++++ fglrx-driver-9-11/common/lib/modules/fglrx/build_mod/firegl_public.c	2009-11-23 10:09:37.000000000 +0100
+@@ -32,6 +32,7 @@
  
+ #if !defined(CONFIG_X86) 
  #if !defined(CONFIG_X86_PC) 
 +#if !defined(CONFIG_X86_XEN)
  #if !defined(CONFIG_X86_64)
  #if !defined(CONFIG_X86_VOYAGER)
  #if !defined(CONFIG_X86_NUMAQ)
-@@ -47,6 +48,7 @@
+@@ -49,6 +50,7 @@
  #endif
  #endif
  #endif