[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4.4.svn151842-1-7-g05f34d0

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 05f34d0a2d15153aff1614543ea03fed21401191
Merge: fe00c7e8c9e3eea482f353bd228e91f63aa7386d f9240353976148734f89c6d55dea1920d9a6c5d2
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sun Apr 25 13:26:30 2010 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-mono/packages/mono
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 58c1e9b,0cac18e..c85d67c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,27 +1,30 @@@
- mono (2.4.4~svn151842-2~pre1) unstable; urgency=low
+ mono (2.4.4~svn151842-2) UNRELEASED; urgency=low
  
 -  [ Mirco Bauer ]
    * NOT RELEASED YET
++  [ Mirco Bauer ]
    * debian/control:
      + Changed section of libmono-dev back to cli-mono.
 +  * mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs
 +    mcs/class/System.Web/System.Web.UI.WebControls/TableRowCollection.cs:
 +    + Reverted dpatch changes that were done accidentally.
  
+   [ Iain Lane ]
+   * debian/update-monodoc: Check whether monodoc-browser is configured before
+     generating the search index in the trigger. Previously the lack of this
+     caused uninstallability due to monodoc not being able to find GTK# in the
+     GAC. (Closes: #575803)
+ 
+   [ Jo Shields ]
+   * debian/patches/mono-arm-thumb2-ftbfs.dpatch:
+     + Use GCC atomic built-ins to prevent FTBFS on ARM with Thumb2 (Thanks to
+       Alexander Sack <asac at ubuntu.com>)
+   * debian/patches/mono-thumb2-jit-blx.dpatch:
+     + Assorted JIT fixes for ARM (Thanks to Alexander Sack <asac at ubuntu.com>)
+   * debian/patches/arm-cpuinfo-parsing.dpatch:
+     + Smarter CPU detection, to allow Mono to run properly under QEMU without
+       asserting and dying (Thanks to Loïc Minier <loic.minier at ubuntu.com>)
+ 
 - -- Mirco Bauer <meebey at debian.org>  Sat, 20 Feb 2010 12:13:59 +0100
 + -- Mirco Bauer <meebey at debian.org>  Sat, 24 Apr 2010 20:57:36 +0200
  
  mono (2.4.4~svn151842-1) unstable; urgency=medium
  

-- 
mono