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

[Patrick Matthäi]

Author: pmatthaei
Date: 2010-07-26 18:12:16 +0000 (Mon, 26 Jul 2010)
New Revision: 434

Removed:
   fglrx-driver/trunk/debian/patches/06-build-with-2.6.34.diff
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
Log:
* New upstream release.
  - Remove patch 06-build-with-2.6.34.diff, merged by upstream.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2010-07-26 18:08:37 UTC (rev 433)
+++ fglrx-driver/trunk/debian/changelog	2010-07-26 18:12:16 UTC (rev 434)
@@ -1,4 +1,4 @@
-fglrx-driver (1:10-6-2) UNRELEASED; urgency=low
+fglrx-driver (1:10-7-1) UNRELEASED; urgency=low
 
   [ Michael Gilbert ]
   * Use fglrx module makefile instead of its make.sh script (this has the
@@ -8,11 +8,13 @@
     Closes: #586808
 
   [ Patrick Matthäi ]
+  * New upstream release.
+    - Remove patch 06-build-with-2.6.34.diff, merged by upstream.
   * Remove Bertrand Marc from uploaders. Thanks for your previous work!
   * Reference to the radeon driver, instead of the deprecated radeonhd one.
   * Bump Standards-Version to 3.9.0 (no changes needed).
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 08 Jul 2010 18:02:32 +0200
+ -- Patrick Matthäi <pmatthaei at debian.org>  Mon, 26 Jul 2010 20:11:38 +0200
 
 fglrx-driver (1:10-6-1) unstable; urgency=low
 

Deleted: fglrx-driver/trunk/debian/patches/06-build-with-2.6.34.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/06-build-with-2.6.34.diff	2010-07-26 18:08:37 UTC (rev 433)
+++ fglrx-driver/trunk/debian/patches/06-build-with-2.6.34.diff	2010-07-26 18:12:16 UTC (rev 434)
@@ -1,13 +0,0 @@
-# Experimental patch, to build with 2.6.34: untested!
-
-diff -Naur fglrx-driver-10-4.orig/common/lib/modules/fglrx/build_mod/kcl_wait.c fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_wait.c
---- fglrx-driver-10-4.orig/common/lib/modules/fglrx/build_mod/kcl_wait.c	2010-05-20 21:45:34.000000000 +0200
-+++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_wait.c	2010-05-20 21:46:51.000000000 +0200
-@@ -39,6 +39,7 @@
- #include <linux/wait.h>
- #include <linux/highmem.h>
- #include <linux/sched.h>
-+#include <linux/slab.h>
- 
- #include "kcl_config.h"
- #include "kcl_wait.h"

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2010-07-26 18:08:37 UTC (rev 433)
+++ fglrx-driver/trunk/debian/patches/series	2010-07-26 18:12:16 UTC (rev 434)
@@ -1,3 +1,2 @@
 01-CONFIG_X86_XEN.diff
 03-authatieventsd.sh.diff
-06-build-with-2.6.34.diff