[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4.3+dfsg-1-8-g8d85470

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 8d8547003c18ff87e062d76d0bde1946bd82d81d
Author: Mirco Bauer <meebey at meebey.net>
Date:   Wed Feb 17 21:46:59 2010 +0100

    Mono 2.4.4~svn LUV!
    
      * New upstream SVN snapshot of the mono-2-4 branch
        + Fixed assertion failed in fieldref_encode_signature which caused
          SIGABRT. (Closes: #565548)
      * debian/fix_large_ranges_in_random_generator_r146995.dpatch:
        + Dropped, already applied upstream.
      * debian/cli.binfmt:
        + Replaced mono-common with mono-runtime. (Closes: #565490)
      * debian/mono-runtime.postinst:
        + Removed obsolete mono-common / mono-jit traces.

diff --git a/debian/changelog b/debian/changelog
index d4e5ab7..1830f0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mono (2.4.3+dfsg-2) UNRELEASED; urgency=low
+mono (2.4.4~svn151842-1~pre1) UNRELEASED; urgency=medium
 
   [ Jo Shields ]
   * debian/patches/dont_assert_on_empty_DGC_field_r146984.dpatch:
@@ -9,6 +9,11 @@ mono (2.4.3+dfsg-2) UNRELEASED; urgency=low
       searching for "()" and other characters (Closes: #516597)
 
   [ Mirco Bauer ]
+  * New upstream SVN snapshot of the mono-2-4 branch
+    + Fixed assertion failed in fieldref_encode_signature which caused
+      SIGABRT. (Closes: #565548)
+  * debian/fix_large_ranges_in_random_generator_r146995.dpatch:
+    + Dropped, already applied upstream.
   * debian/watch:
     + We are only watching the 2.4 series for now (until squeeze is released)
   * debian/control:
@@ -18,8 +23,12 @@ mono (2.4.3+dfsg-2) UNRELEASED; urgency=low
     + Dropped purpose less libmono-nunit2.4-cil package as libmono-cil-dev
       does the job now.
     + Added conflicts libmono-nunit2.4-cil to libmono-cil-dev for cleaning up.
+  * debian/cli.binfmt:
+    + Replaced mono-common with mono-runtime. (Closes: #565490)
+  * debian/mono-runtime.postinst:
+    + Removed obsolete mono-common / mono-jit traces.
 
- -- Mirco Bauer <meebey at debian.org>  Sat, 09 Jan 2010 14:07:57 +0100
+ -- Mirco Bauer <meebey at debian.org>  Wed, 17 Feb 2010 21:43:42 +0100
 
 mono (2.4.3+dfsg-1) unstable; urgency=medium
 
diff --git a/debian/cli.binfmt b/debian/cli.binfmt
index 68e881c..d067c23 100644
--- a/debian/cli.binfmt
+++ b/debian/cli.binfmt
@@ -1,4 +1,4 @@
-package mono-common
+package mono-runtime 
 detector /usr/lib/cli/binfmt-detector-cli
 interpreter /usr/bin/cli
 magic MZ
diff --git a/debian/mono-runtime.postinst b/debian/mono-runtime.postinst
index 2ae2179..5ec2dee 100644
--- a/debian/mono-runtime.postinst
+++ b/debian/mono-runtime.postinst
@@ -1,12 +1,5 @@
 #!/bin/sh -e
 
-# if we're configuring, /usr/share/doc/mono-jit is a directory,
-# and isn't a symlink, replace it with a symlink to mono-common
-if test "$1" = "configure" && test -d /usr/share/doc/mono-jit && ! test -h /usr/share/doc/mono-jit ; then
-	rmdir /usr/share/doc/mono-jit
-	ln -s mono-common /usr/share/doc/mono-jit
-fi
-
 update-alternatives \
 	--install /usr/bin/cli cli /usr/bin/mono 10 \
 	--slave /usr/share/man/man1/cli.1.gz cli.1.gz /usr/share/man/man1/mono.1.gz
diff --git a/debian/patches/00list b/debian/patches/00list
index 42a7b34..01c10e7 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -15,7 +15,6 @@ fix_mdoc_build
 fix_tuner_build
 fix_CreateDelegate_ArgumentException
 fix_DynamicMethod_restrictedSkipVisibility_r138886
-fix_large_ranges_in_random_generator_r146995
 disable_building_convert.exe
 disable_building_RabbitMQ.Client.dll
 disable_bug-80307_test
diff --git a/debian/patches/fix_large_ranges_in_random_generator_r146995.dpatch b/debian/patches/fix_large_ranges_in_random_generator_r146995.dpatch
deleted file mode 100755
index cdf6b6a..0000000
--- a/debian/patches/fix_large_ranges_in_random_generator_r146995.dpatch
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_large_ranges_in_random_generator_r146995.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: 2009-11-26  Sebastien Pouliot  <sebastien at ximian.com>
-## DP:	* Random.cs: Fix case where the diff between min and max
-## DP:    is very large in Next(int,int). Fix bug #558593
-## DP:	  [Backport r146993]
-
- at DPATCH@
-diff -urNad git~/mcs/class/corlib/System/Random.cs git/mcs/class/corlib/System/Random.cs
---- git~/mcs/class/corlib/System/Random.cs	2009-10-26 21:44:45.000000000 +0100
-+++ git/mcs/class/corlib/System/Random.cs	2009-12-13 19:49:47.000000000 +0100
-@@ -124,7 +124,7 @@
- 			if (diff <= 1)
- 				return minValue;
- 
--			return (int)(Sample () * diff) + minValue;
-+			return (int)((uint)(Sample () * diff) + minValue);
- 		}
- 
- 		public virtual void NextBytes (byte [] buffer)

-- 
mono