Add MIT license and update debian scripts to use it

6 files changed, 36 insertions, 17 deletions

diff --git a/LICENSE-MIT b/LICENSE-MIT
new file mode 100644
index 0000000..486e6e0
--- /dev/null
+++ b/LICENSE-MIT
@@ -0,0 +1,25 @@
+Portions created by VMware are Copyright (c) 2007-2012 VMware, Inc.
+All Rights Reserved.
+
+Portions created by Tony Garnock-Jones are Copyright (c) 2009-2010
+VMware, Inc. and Tony Garnock-Jones. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use, copy,
+modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/Makefile.am b/Makefile.am
index d5bac3f..a990faa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,4 +18,4 @@ codegen:
 	cp -r "$(top_srcdir)/$(AMQP_CODEGEN_DIR)"/* $@
 	$(MAKE) -C $@ clean
 
-EXTRA_DIST=codegen debian LICENSE-MPL-RabbitMQ LICENSE-GPL-2.0
+EXTRA_DIST=codegen debian LICENSE-MIT
diff --git a/debian/amqp-tools.docs b/debian/amqp-tools.docs
index c9f23af..e2cf5a1 100644
--- a/debian/amqp-tools.docs
+++ b/debian/amqp-tools.docs
@@ -1,3 +1 @@
-COPYING
-LICENSE-MPL-RabbitMQ
-LICENSE-GPL-2.0
+LICENSE-MIT
diff --git a/debian/copyright b/debian/copyright
index f7f6d4c..c3be404 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,15 +3,15 @@ This package was debianized by Tony Garnock-Jones
 
 Upstream Author: The RabbitMQ team at VMware, Inc. <info@rabbitmq.net>
 
-Copyright: Portions created by VMware are Copyright (c) 2007-2011
-VMware, Inc. Portions created by Tony Garnock-Jones are Copyright (c)
-2009-2010 VMware, Inc. and Tony Garnock-Jones.
+Copyright: Portions created by VMware are Copyright (c) 2007-2012
+VMware, Inc. All Rights Reserved. Portions created by Tony
+Garnock-Jones are Copyright (c) 2009-2010 VMware, Inc. and Tony
+Garnock-Jones. All Rights Reserved.
 
 License: This package, librabbitmq, the RabbitMQ C client, is licensed
-under the MPL and may also be used under the terms of the GPL. For the
-MPL, please see LICENSE-MPL-RabbitMQ. For the GPL, please see
-LICENSE-GPL-2.0. Please see also the license block near the top of
-each source file in the package.
+under the MIT. For the license, please see LICENSE-MIT. Please see
+also the license block near the top of each source file in the
+package.
 
 If you have any questions regarding licensing, please contact us at
 info@rabbitmq.com.
diff --git a/debian/librabbitmq-dev.docs b/debian/librabbitmq-dev.docs
index c9f23af..e2cf5a1 100644
--- a/debian/librabbitmq-dev.docs
+++ b/debian/librabbitmq-dev.docs
@@ -1,3 +1 @@
-COPYING
-LICENSE-MPL-RabbitMQ
-LICENSE-GPL-2.0
+LICENSE-MIT
diff --git a/debian/librabbitmq.docs b/debian/librabbitmq.docs
index c9f23af..e2cf5a1 100644
--- a/debian/librabbitmq.docs
+++ b/debian/librabbitmq.docs
@@ -1,3 +1 @@
-COPYING
-LICENSE-MPL-RabbitMQ
-LICENSE-GPL-2.0
+LICENSE-MIT