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

[Mirco Bauer]

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

    Jo Shields' DFSG LUV!
    
      * debian/patches/disable_building_convert.exe.dpatch
        debian/patches/disable_building_RabbitMQ.Client.dll.dpatch:
        + Dropped, we can build the RabbitMQ client library and convert.exe again,
          as the source is provided now (see above).

diff --git a/debian/changelog b/debian/changelog
index 1830f0b..1594da1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,12 @@ mono (2.4.4~svn151842-1~pre1) UNRELEASED; urgency=medium
   * New upstream SVN snapshot of the mono-2-4 branch
     + Fixed assertion failed in fieldref_encode_signature which caused
       SIGABRT. (Closes: #565548)
+    + Mono is now DFSG complaint again by default, the binary-only shipped
+      files were replaced with source code.
+  * debian/patches/disable_building_convert.exe.dpatch
+    debian/patches/disable_building_RabbitMQ.Client.dll.dpatch:
+    + Dropped, we can build the RabbitMQ client library and convert.exe again,
+      as the source is provided now (see above).
   * debian/fix_large_ranges_in_random_generator_r146995.dpatch:
     + Dropped, already applied upstream.
   * debian/watch:
@@ -28,7 +34,7 @@ mono (2.4.4~svn151842-1~pre1) UNRELEASED; urgency=medium
   * debian/mono-runtime.postinst:
     + Removed obsolete mono-common / mono-jit traces.
 
- -- Mirco Bauer <meebey at debian.org>  Wed, 17 Feb 2010 21:43:42 +0100
+ -- Mirco Bauer <meebey at debian.org>  Wed, 17 Feb 2010 21:51:40 +0100
 
 mono (2.4.3+dfsg-1) unstable; urgency=medium
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 01c10e7..9796313 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -15,8 +15,6 @@ fix_mdoc_build
 fix_tuner_build
 fix_CreateDelegate_ArgumentException
 fix_DynamicMethod_restrictedSkipVisibility_r138886
-disable_building_convert.exe
-disable_building_RabbitMQ.Client.dll
 disable_bug-80307_test
 build_cecil_as_2.0
 build_firebirdsql_as_2.0
diff --git a/debian/patches/disable_building_RabbitMQ.Client.dll.dpatch b/debian/patches/disable_building_RabbitMQ.Client.dll.dpatch
deleted file mode 100755
index 6a4ceb0..0000000
--- a/debian/patches/disable_building_RabbitMQ.Client.dll.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## disable_building_RabbitMQ.Client.dll.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~/mcs/class/Makefile git/mcs/class/Makefile
---- git~/mcs/class/Makefile	2009-12-13 16:02:58.000000000 +0100
-+++ git/mcs/class/Makefile	2009-12-13 16:14:55.000000000 +0100
-@@ -77,10 +77,8 @@
- 	Novell.Directory.Ldap		\
- 	Mono.Security.Win32		\
- 	System.DirectoryServices	\
--	RabbitMQ.Client			\
- 	Mono.Messaging			\
- 	System.Messaging	        \
--	Mono.Messaging.RabbitMQ		\
- 	System.ServiceProcess           \
- 	System.Drawing.Design		\
- 	System.Design			\
diff --git a/debian/patches/disable_building_convert.exe.dpatch b/debian/patches/disable_building_convert.exe.dpatch
deleted file mode 100755
index 1abe908..0000000
--- a/debian/patches/disable_building_convert.exe.dpatch
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## disable_building_convert.exe.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 mono-2.4+dfsg~/Makefile.am mono-2.4+dfsg/Makefile.am
---- mono-2.4+dfsg~/Makefile.am	2009-02-14 00:34:54.000000000 +0100
-+++ mono-2.4+dfsg/Makefile.am	2009-04-11 04:18:32.000000000 +0200
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = foreign
- ACLOCAL_AMFLAGS = -I .
- 
--SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc docs
-+SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc
- 
- # Keep in sync with SUBDIRS
- ## 'tools' is not normally built
-diff -urNad mono-2.4+dfsg~/docs/Makefile.am mono-2.4+dfsg/docs/Makefile.am
---- mono-2.4+dfsg~/docs/Makefile.am	2009-02-14 00:32:42.000000000 +0100
-+++ mono-2.4+dfsg/docs/Makefile.am	2009-04-11 04:15:52.000000000 +0200
-@@ -97,14 +97,10 @@
- mono-file-formats.tree: docs.make Makefile.am $(srcdir)/deploy/.stamp
- 	cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@
- 
--$(srcdir)/deploy/.stamp: convert.exe Makefile.am
-+$(srcdir)/deploy/.stamp: Makefile.am
- 	$(mkdir_p) $(srcdir)/html
- 	runtimedir=`cd ../runtime && pwd`; export runtimedir; \
- 	cd $(srcdir) && MONO_PATH=$(mcs_topdir_from_srcdir)/class/lib/net_2_0 perl ./exdoc -h . ../mono/*/*.c
- 	touch $@
- 
- extract: $(srcdir)/deploy/.stamp
--
--convert.exe: convert.cs AgilityPack.dll
--	cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) convert.exe
--

-- 
mono