[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4.2.3+dfsg-3-14-g1a17235

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 4c1e5896989950c47ec733165ea5510839ffbad4
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sun Dec 13 01:57:31 2009 +0100

      * debian/patches/fix_metadata_dup.dpatch:
        + Dropped, applied upstream.

diff --git a/debian/changelog b/debian/changelog
index 9d0fedb..b688e79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,8 +31,10 @@ mono (2.4.3+dfsg-1~pre1) UNRELEASED; urgency=medium
       (Closes: #551909)
     + Fixed typo in monodoc-base and monodoc-manual package description.
       (Closes: #557355, #557379)
+  * debian/patches/fix_metadata_dup.dpatch:
+    + Dropped, applied upstream.
 
- -- Mirco Bauer <meebey at debian.org>  Sat, 12 Dec 2009 19:30:46 +0100
+ -- Mirco Bauer <meebey at debian.org>  Sun, 13 Dec 2009 01:56:40 +0100
 
 mono (2.4.2.3+dfsg-3) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index b536799..3c375d5 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -13,7 +13,6 @@ fix_mono-api-info_build
 fix_csharplib_build
 fix_mdoc_build
 fix_tuner_build
-fix_metadata_dup
 fix_CreateDelegate_ArgumentException
 fix_gridview_r146128_r146133
 disable_building_convert.exe
diff --git a/debian/patches/fix_metadata_dup.dpatch b/debian/patches/fix_metadata_dup.dpatch
deleted file mode 100755
index 66b987c..0000000
--- a/debian/patches/fix_metadata_dup.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_metadata_dup.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 git~/mono/metadata/Makefile.am git/mono/metadata/Makefile.am
---- git~/mono/metadata/Makefile.am	2009-07-15 20:49:47.000000000 +0200
-+++ git/mono/metadata/Makefile.am	2009-09-07 21:43:48.000000000 +0200
-@@ -171,7 +171,6 @@
- 	object.h	\
- 	exception.h	\
- 	profiler.h	\
--	appdomain.h	\
- 	mono-config.h	\
- 	debug-helpers.h	\
- 	mempool.h

-- 
mono