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

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 34193d33b46b70c9200fe2b711c6eefafa929839
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Dec 12 20:01:49 2009 +0100

      * New upstream release
      * debian/control
        debian/rules
        debian/copyright:
        + Dropped the RabbitMQ library with spec sources again, as the
          auto-generated API source files without DFSG-free sources for the
          generator are not good enough. (Closes: #560151)

diff --git a/debian/changelog b/debian/changelog
index 24d27c7..9d0fedb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mono (2.4.2.3+dfsg-4) UNRELEASED; urgency=low
+mono (2.4.3+dfsg-1~pre1) UNRELEASED; urgency=medium
 
   [ Jo Shields ]
   * debian/monodoc-base.postinst,
@@ -13,6 +13,13 @@ mono (2.4.2.3+dfsg-4) UNRELEASED; urgency=low
     upon a new install of monodoc-base (to generate the initial index)
 
   [ Mirco Bauer ]
+  * New upstream release
+  * debian/control
+    debian/rules
+    debian/copyright:
+    + Dropped the RabbitMQ library with spec sources again, as the
+      auto-generated API source files without DFSG-free sources for the
+      generator are not good enough. (Closes: #560151)
   * debian/update-monodoc:
     + Handle search index too.
   * debian/libmono-profiler.install:
@@ -25,7 +32,7 @@ mono (2.4.2.3+dfsg-4) UNRELEASED; urgency=low
     + Fixed typo in monodoc-base and monodoc-manual package description.
       (Closes: #557355, #557379)
 
- -- Jo Shields <directhex at apebox.org>  Fri, 27 Nov 2009 13:34:49 +0000
+ -- Mirco Bauer <meebey at debian.org>  Sat, 12 Dec 2009 19:30:46 +0100
 
 mono (2.4.2.3+dfsg-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 721c364..a668a2f 100644
--- a/debian/control
+++ b/debian/control
@@ -118,8 +118,6 @@ Depends: mono-runtime (= ${binary:Version}),
          libmono-nunit2.4-cil (= ${source:Version}),
          libmono-management2.0-cil (= ${source:Version}),
          libmono-messaging2.0-cil (= ${source:Version}),
-         libmono-messaging-rabbitmq2.0-cil (= ${source:Version}),
-         libmono-rabbitmq2.0-cil (= ${source:Version}),
          libmono-simd2.0-cil (= ${source:Version}),
          libmono-i18n1.0-cil (= ${source:Version}),
          libmono-i18n2.0-cil (= ${source:Version}),
@@ -473,32 +471,6 @@ Description: Mono Messaging library (for CLI 2.0)
  messaging functionality using different implementations. At this time Mono
  does not provide a System.Messaging implementation.
 
-Package: libmono-messaging-rabbitmq2.0-cil
-Architecture: all
-Depends: ${cli:Depends}
-Homepage: http://mono-project.com/SystemMessaging
-Description: Mono Messaging RabbitMQ library (for CLI 2.0)
- Mono is a platform for running and developing applications based on the
- ECMA/ISO Standards. Mono is an open source effort led by Novell.
- Mono provides a complete CLR (Common Language Runtime) including compiler and
- runtime, which can produce and execute CIL (Common Intermediate Language)
- bytecode (aka assemblies), and a class library.
- .
- This package contains the Mono.Messaging.RabbitMQ library for CLI 2.0.
-
-Package: libmono-rabbitmq2.0-cil
-Architecture: all
-Depends: ${cli:Depends}
-Homepage: http://mono-project.com/SystemMessaging
-Description: Mono RabbitMQ.Client library (for CLI 2.0)
- Mono is a platform for running and developing applications based on the
- ECMA/ISO Standards. Mono is an open source effort led by Novell.
- Mono provides a complete CLR (Common Language Runtime) including compiler and
- runtime, which can produce and execute CIL (Common Intermediate Language)
- bytecode (aka assemblies), and a class library.
- .
- This package contains the RabbitMQ.Client library for CLI 2.0.
-
 Package: libmono-simd2.0-cil
 Architecture: all
 Depends: ${cli:Depends}
diff --git a/debian/copyright b/debian/copyright
index 3426e0c..c56a7ed 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -228,6 +228,12 @@ Alexei A. Vorontsov, Charlie Poole or Copyright (C) 2000-2004 Philip A. Craig
 
 -------------------------------------------------------------------------------
 
+mcs/class/RabbitMQ.Client/docs/specs/*.cs
+
+This files are auto-generated by a code generator from a non-free XML
+specification file making this sources not complaint with the DFSG!
+For this reason this sources were removed from the original source tarball.
+
 mcs/class/RabbitMQ.Client/*
 
 Copyright (C) 2007, 2008 LShift Ltd.
diff --git a/debian/rules b/debian/rules
index ad8da83..f297dfc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -488,6 +488,7 @@ 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/*" -print -delete
 	find $(TARBALL_DIR) -name "*.exe" -not -path "$(TARBALL_DIR)/mcs/class/lib/monolite/*" -print -delete
 	mv $(TARBALL_DIR) $(TARBALL_DIR)+dfsg

-- 
mono