[DRE-commits] [SCM] ruby-ole.git branch, master, updated. debian/1.2.11.1-5-7-gf69f0fe

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit 5a7e79f0d604cbacfb8c05afcc186fbcb78747a1
Author: Gunnar Wolf <gwolf at gwolf.org>
Date:   Tue May 17 17:21:20 2011 -0500

    Licensing information was mistaken

diff --git a/debian/copyright b/debian/copyright
index a8b0687..6d5b145 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,18 +4,41 @@ Upstream-Contact: Charles Lowe <aquasync at hotmail.com>
 Source: http://code.google.com/p/ruby-ole/
 
 Files: *
-Copyright: Copyright © 2007-2009 Charles Lowe <aquasync at hotmail.com>
-License: GPL-2
+Copyright: Copyright © 2007-2010 Charles Lowe <aquasync at hotmail.com>
+License: MIT-X
 
 Files: debian/*
 Copyright: Copyright © 2009-2011, Gunnar Wolf <gwolf at debian.org>
-License: GPL-2
+License: GPL-3+
 
-License: GPL-2
+License: GPL-3+
  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
+ 3 or -at your option- any later version.
  .
  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'.
+ License version 3x can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+
+License: MIT-X
+ Copyright (c) 2007-2010 Charles Lowe
+ .
+ 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.
+

-- 
ruby-ole.git