[DRE-commits] [SCM] ruby-amqp.git branch, master, updated. debian/0.9.5-1-4-g735716f

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit c8fffb0ac2b28fb3993dcc25d18127eab1cb37f3
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Fri Jun 29 21:25:47 2012 +0200

    Solved some copyright problems

diff --git a/debian/changelog b/debian/changelog
index 80788c4..cba1519 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-amqp (0.9.5-2) UNRELEASED; urgency=low
+
+  * debian/copyright: 
+    - The Ruby license is actually GPL-2 or the specific Ruby license.
+    - Added a license paragraph for GPL-2.
+
+ -- Paul van Tilburg <paulvt at debian.org>  Fri, 29 Jun 2012 21:24:29 +0200
+
 ruby-amqp (0.9.5-1) unstable; urgency=low
 
   * Initial release
diff --git a/debian/copyright b/debian/copyright
index e26cada..6595f2b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,11 +3,12 @@ Upstream-Name: amqp
 Source: http://rubygems.org/gems/amqp
 
 Files: *
-Copyright: 2008 - 2010  Aman Gupta (http://github.com/tmm1)
+Copyright: 2008–2010  Aman Gupta (http://github.com/tmm1)
            2011 VMware, Inc.
-           2010 — 2011  ruby-amqp group members (https://github.com/ruby-amqp)
-License: Ruby
+           2010–2011  ruby-amqp group members (https://github.com/ruby-amqp)
+License: Ruby or GPL-2
 
+License: Ruby
  Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.co.jp>.
  You can redistribute it and/or modify it under either the terms of the GPL
  (see COPYING.txt file), or the conditions below:
@@ -66,6 +67,23 @@ License: Ruby
      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
      PURPOSE.
 
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the Free
+ Software Foundation, version 2 of the License.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this package; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public License version
+ 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
+
 Files: lib/amqp/utilities/server_type.rb
 Copyright: 2009 Daniel DeLeo
            2011 Michael Klishin

-- 
ruby-amqp.git