[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4+dfsg-4-2-gfe80ff4

[Mirco Bauer]

The following commit has been merged in the master branch:
commit fe80ff40c3fb6400e416e2196044f633942fdfb9
Author: Mirco Bauer <meebey at meebey.net>
Date:   Mon Jun 22 00:57:36 2009 +0200

    * restored the -4 changelog, as that one was already uploaded
    * debian/patches/fix_disabling_aot_r131940.dpatch:
      + Fixes the build of kfreebsd-amd64 and kfreebsd-i386.

diff --git a/debian/changelog b/debian/changelog
index ff8d989..7ce76e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,22 @@
-mono (2.4+dfsg-4) unstable; urgency=low
+mono (2.4+dfsg-5) unstable; urgency=low
 
   * debian/rules:
-    + Removed the config.make hack as that broke AMD64 builds and instead let
-      the ./configure script from the configure-indep target create that file.
     + Let the build system decide if sigaltstack() will be used and which TLS
       instead of passing explicitly --with-sigaltstack and --with-tls to
       the ./configure script.
+  * debian/patches/fix_disabling_aot_r131940.dpatch:
+    + Fixes the build of kfreebsd-amd64 and kfreebsd-i386.
 
  -- Mirco Bauer <meebey at debian.org>  Mon, 22 Jun 2009 00:08:35 +0200
 
+mono (2.4+dfsg-4) unstable; urgency=low
+
+  * debian/rules:
+    + Removed the config.make hack as that broke AMD64 builds and instead let
+      the ./configure script from the configure-indep target create that file.
+
+ -- Mirco Bauer <meebey at debian.org>  Sun, 14 Jun 2009 16:52:28 +0200 
+
 mono (2.4+dfsg-3) unstable; urgency=low
 
   * debian/control:
diff --git a/debian/patches/00list b/debian/patches/00list
index b5ffa68..52d602a 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -13,6 +13,7 @@ fix_recursive_unmanaged_types
 fix_ppc_build_using_gcc-4.4_r131472
 fix_sparc_support_r134797
 disable_unavailable_cpu_optimizations_r133647
+fix_disabling_aot_r131940
 fix_mono-api-info_build
 fix_csharplib_build
 fix_mdoc_build
diff --git a/debian/patches/fix_disabling_aot_r131940.dpatch b/debian/patches/fix_disabling_aot_r131940.dpatch
new file mode 100755
index 0000000..85157ff
--- /dev/null
+++ b/debian/patches/fix_disabling_aot_r131940.dpatch
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_disabling_aot_r131940.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch taken from upstream's SVN repository revision: 131940
+## DP: 2009-04-16  Zoltan Varga  <vargaz at gmail.com>
+## DP: * aot-compiler.c (mono_xdebug_init): Fix the DISABLE_AOT build.
+
+diff -urNad git~/mono/mini/aot-compiler.c git/mono/mini/aot-compiler.c
+--- git~/mono/mini/aot-compiler.c	2009-05-25 19:46:20.000000000 +0200
++++ git/mono/mini/aot-compiler.c	2009-06-22 00:53:34.000000000 +0200
+@@ -6247,6 +6247,11 @@
+ }
+ 
+ void
++mono_xdebug_init (void)
++{
++}
++
++void
+ mono_save_xdebug_info (MonoMethod *method, guint8 *code, guint32 code_size, MonoInst **args, GSList *unwind_info)
+ {
+ }

-- 
mono