[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4.4.svn151842-2-51-g38682b8

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 7eaaf7fd08284950c62d3963b15df8d7fc27d1c1
Merge: b24fa3c6d8aea98d40acec29b3bee0bc65cf9ae6 fda19a81bf26653c4f71faaf172e6f45512c8917
Author: Mirco Bauer <meebey at meebey.net>
Date:   Thu Jun 24 23:32:40 2010 +0200

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

diff --combined debian/changelog
index 1138174,09ed869..a44b846
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,18 @@@
- mono (2.4.4~svn151842-3~pre1) unstable; urgency=low
 -mono (2.4.4~svn151842-3) UNRELEASED; urgency=low
++mono (~pre12.4.4~svn151842-3~pre1) UNRELEASED; urgency=low
  
++  [ Mirco Bauer ]
 +  * The "Good bye dpatch, hello git" release
 +  * debian/control
 +    debian/rules
 +    debian/patches/*:
 +    + Replaced dpatches with git branches.
 +
++  [ Iain Lane ]
+   * debian/update-monodoc: Fix syntax error that occurs when sh is bash but
+     not dash. Prevented the generation of the monodoc search indexes using
+     the trigger.
+ 
 - -- Iain Lane <laney at ubuntu.com>  Wed, 26 May 2010 10:44:55 +0100
 + -- Mirco Bauer <meebey at debian.org>  Sat, 08 May 2010 20:52:33 +0200
  
  mono (2.4.4~svn151842-2) unstable; urgency=low
  

-- 
mono