[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4+dfsg-6-26-g8b65c7c

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 14ecd0c891d30da03e5bfab4472f459ead25ab37
Author: Mirco Bauer <meebey at meebey.net>
Date:   Wed Jul 29 20:27:01 2009 +0200

        + Shipping the RabbitMQ.Client library now the non-free bits were
          removed.

diff --git a/debian/changelog b/debian/changelog
index 050ac09..e95aba4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 mono (2.4.2.3+dfsg-1~pre1) unstable; urgency=low
 
   * New upstream release.
+    + Shipping the RabbitMQ.Client library now the non-free bits were
+      removed.
 
  -- Mirco Bauer <meebey at debian.org>  Wed, 29 Jul 2009 16:34:12 +0200
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 52d602a..e6cd0e9 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -19,7 +19,6 @@ fix_csharplib_build
 fix_mdoc_build
 fix_tuner_build
 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 e145cf0..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 mono-2.4+dfsg~/mcs/class/Makefile mono-2.4+dfsg/mcs/class/Makefile
---- mono-2.4+dfsg~/mcs/class/Makefile	2009-02-14 00:56:37.000000000 +0100
-+++ mono-2.4+dfsg/mcs/class/Makefile	2009-05-08 23:56:11.000000000 +0200
-@@ -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/rules b/debian/rules
index 68fd392..3587cbd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -486,11 +486,8 @@ get-orig-source:
 	fi
 	tar -xzf $(DEB_SOURCE_NAME)_$(UPVERSION).orig.tar.gz
 	rm $(DEB_SOURCE_NAME)_$(UPVERSION).orig.tar.gz
-	rm -rf $(TARBALL_DIR)/mcs/class/RabbitMQ.Client/docs/specs/
-	find $(TARBALL_DIR) -name "*.dll" -not -path "$(TARBALL_DIR)/mcs/class/lib/monolite/*"
-	find $(TARBALL_DIR) -name "*.dll" -not -path "$(TARBALL_DIR)/mcs/class/lib/monolite/*" -delete
-	find $(TARBALL_DIR) -name "*.exe" -not -path "$(TARBALL_DIR)/mcs/class/lib/monolite/*"
-	find $(TARBALL_DIR) -name "*.exe" -not -path "$(TARBALL_DIR)/mcs/class/lib/monolite/*" -delete
+	find $(TARBALL_DIR) -name "*.dll" -not -path "$(TARBALL_DIR)/mcs/class/lib/monolite/*" -print -delete
+	find $(TARBALL_DIR) -name "*.exe" -not -path "$(TARBALL_DIR)/mcs/class/lib/monolite/*" -print -delete
 	mv $(TARBALL_DIR) $(TARBALL_DIR)+dfsg
 	tar -czf $(DEB_SOURCE_NAME)_$(UPVERSION)+dfsg.orig.tar.gz $(TARBALL_DIR)+dfsg
 	rm -r $(TARBALL_DIR)+dfsg

-- 
mono