Bug#608627: NMU patch for xresprobe 0.4.23debian1-0.2

[Petter Reinholdtsen <pere@hungry.com>]

Package: xresprobe
Version: 0.4.23debian1

Here is the patch for my NMU of xresprobe.

diff -u xresprobe-0.4.23debian1/debian/changelog xresprobe-0.4.23debian1/debian/changelog
--- xresprobe-0.4.23debian1/debian/changelog
+++ xresprobe-0.4.23debian1/debian/changelog
@@ -1,3 +1,13 @@
+xresprobe (0.4.23debian1-0.2) unstable; urgency=low
+
+  * Non-maintainer upload to fix RC bug.
+  * Fix typo 'to to' in package description.
+  * Apply patch from Ubuntu:
+    - Fix build problem with recent kernels by defining *_MASK in
+      ddcprobe/lrmi.c (Closes: #608187).  Patch from Chris Coulson.
+
+ -- Petter Reinholdtsen <pere@hungry.com>  Sun, 02 Jan 2011 08:56:48 +0100
+
 xresprobe (0.4.23debian1-0.1) unstable; urgency=low
 
   * Non-maintainer upload with maintainer approval.
diff -u xresprobe-0.4.23debian1/debian/control xresprobe-0.4.23debian1/debian/control
--- xresprobe-0.4.23debian1/debian/control
+++ xresprobe-0.4.23debian1/debian/control
@@ -23 +23 @@
- are, however, sufficiently generic to to be useful to other architectures.
+ are, however, sufficiently generic to be useful to other architectures.
only in patch2:
unchanged:
--- xresprobe-0.4.23debian1.orig/ddcprobe/lrmi.c
+++ xresprobe-0.4.23debian1/ddcprobe/lrmi.c
@@ -54,6 +54,13 @@
 #include "include/lrmi.h"
 #include "x86-common.h"
 
+#if defined(__linux__) && !defined(TF_MASK)
+	#define TF_MASK X86_EFLAGS_TF
+	#define IF_MASK X86_EFLAGS_IF
+	#define VIF_MASK X86_EFLAGS_VIF
+	#define IOPL_MASK X86_EFLAGS_IOPL
+#endif
+
 #if defined(__linux__)
 #define DEFAULT_VM86_FLAGS 	(IF_MASK | IOPL_MASK)
 #elif defined(__NetBSD__) || defined(__FreeBSD__)

Happy hacking,
-- 
Petter Reinholdtsen