[Pkg-mono-svn-commits] rev 3644 - in mono-debugger/trunk/debian: . patches

[Mirco Bauer]

Author: meebey
Date: 2008-06-01 13:24:04 +0000 (Sun, 01 Jun 2008)
New Revision: 3644

Added:
   mono-debugger/trunk/debian/patches/fix_build_with_libc_r98147_r98369.dpatch
Modified:
   mono-debugger/trunk/debian/changelog
   mono-debugger/trunk/debian/patches/00list
Log:
  * debian/patches/fix_build_with_libc_r98147_r98369.dpatch:
    + Using sys/user.h instead of asm/user.h, fixes FTBFS. (Closes: #479901)
      (patch taken from upstream's SVN repo, revision 98147 and 98369)



Modified: mono-debugger/trunk/debian/changelog
===================================================================
--- mono-debugger/trunk/debian/changelog	2008-05-25 22:35:52 UTC (rev 3643)
+++ mono-debugger/trunk/debian/changelog	2008-06-01 13:24:04 UTC (rev 3644)
@@ -1,3 +1,11 @@
+mono-debugger (0.60+dfsg-4) unstable; urgency=medium
+
+  * debian/patches/fix_build_with_libc_r98147_r98369.dpatch:
+    + Using sys/user.h instead of asm/user.h, fixes FTBFS. (Closes: #479901)
+      (patch taken from upstream's SVN repo, revision 98147 and 98369)
+
+ -- Mirco Bauer <meebey at debian.org>  Sun, 01 Jun 2008 15:22:24 +0200
+
 mono-debugger (0.60+dfsg-3) unstable; urgency=low
 
   * debian/control:

Modified: mono-debugger/trunk/debian/patches/00list
===================================================================
--- mono-debugger/trunk/debian/patches/00list	2008-05-25 22:35:52 UTC (rev 3643)
+++ mono-debugger/trunk/debian/patches/00list	2008-06-01 13:24:04 UTC (rev 3644)
@@ -1,3 +1,4 @@
 use_real_nunit
 fix_dllmap
 link_system_libs
+fix_build_with_libc_r98147_r98369

Added: mono-debugger/trunk/debian/patches/fix_build_with_libc_r98147_r98369.dpatch
===================================================================
--- mono-debugger/trunk/debian/patches/fix_build_with_libc_r98147_r98369.dpatch	                        (rev 0)
+++ mono-debugger/trunk/debian/patches/fix_build_with_libc_r98147_r98369.dpatch	2008-06-01 13:24:04 UTC (rev 3644)
@@ -0,0 +1,58 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_build_with_libc_r98147.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mono-debugger-0.60+dfsg~/backend/server/i386-arch.h mono-debugger-0.60+dfsg/backend/server/i386-arch.h
+--- mono-debugger-0.60+dfsg~/backend/server/i386-arch.h	2008-06-01 15:16:40.000000000 +0200
++++ mono-debugger-0.60+dfsg/backend/server/i386-arch.h	2008-06-01 15:17:40.000000000 +0200
+@@ -7,10 +7,10 @@
+ 
+ #if defined(__i386__)
+ 
+-#include <asm/user.h>
++#include <sys/user.h>
+ 
+ #define INFERIOR_REGS_TYPE	struct user_regs_struct
+-#define INFERIOR_FPREGS_TYPE	struct user_i387_struct
++#define INFERIOR_FPREGS_TYPE	struct user_fpregs_struct
+ 
+ #define INFERIOR_REG_EIP(r)	r.eip
+ #define INFERIOR_REG_ESP(r)	r.esp
+@@ -23,12 +23,12 @@
+ #define INFERIOR_REG_EDI(r)	r.edi
+ #define INFERIOR_REG_EFLAGS(r)	r.eflags
+ #define INFERIOR_REG_ESP(r)	r.esp
+-#define INFERIOR_REG_FS(r)	r.fs
+-#define INFERIOR_REG_ES(r)	r.es
+-#define INFERIOR_REG_DS(r)	r.ds
+-#define INFERIOR_REG_CS(r)	r.cs
+-#define INFERIOR_REG_SS(r)	r.ss
+-#define INFERIOR_REG_GS(r)	r.gs
++#define INFERIOR_REG_FS(r)	r.xfs
++#define INFERIOR_REG_ES(r)	r.xes
++#define INFERIOR_REG_DS(r)	r.xds
++#define INFERIOR_REG_CS(r)	r.xcs
++#define INFERIOR_REG_SS(r)	r.xss
++#define INFERIOR_REG_GS(r)	r.xgs
+ 
+ G_END_DECLS
+ 
+diff -urNad mono-debugger-0.60+dfsg~/backend/server/x86_64-arch.h mono-debugger-0.60+dfsg/backend/server/x86_64-arch.h
+--- mono-debugger-0.60+dfsg~/backend/server/x86_64-arch.h	2008-06-01 15:16:40.000000000 +0200
++++ mono-debugger-0.60+dfsg/backend/server/x86_64-arch.h	2008-06-01 15:17:25.000000000 +0200
+@@ -7,10 +7,10 @@
+ 
+ #if defined(__x86_64__)
+ 
+-#include <asm/user.h>
++#include <sys/user.h>
+ 
+ #define INFERIOR_REGS_TYPE	struct user_regs_struct
+-#define INFERIOR_FPREGS_TYPE	struct user_i387_struct
++#define INFERIOR_FPREGS_TYPE	struct user_fpregs_struct
+ 
+ #define INFERIOR_REG_R15(r)	r.r15
+ #define INFERIOR_REG_R14(r)	r.r14


Property changes on: mono-debugger/trunk/debian/patches/fix_build_with_libc_r98147_r98369.dpatch
___________________________________________________________________
Name: svn:executable
   + *