[DRE-commits] r4356 - trunk/libmocha-ruby/debian

[Antonio Terceiro]

Author: terceiro-guest
Date: 2009-11-20 22:52:43 +0000 (Fri, 20 Nov 2009)
New Revision: 4356

Modified:
   trunk/libmocha-ruby/debian/changelog
   trunk/libmocha-ruby/debian/copyright
Log:
New upstream release



Modified: trunk/libmocha-ruby/debian/changelog
===================================================================
--- trunk/libmocha-ruby/debian/changelog	2009-11-20 19:51:38 UTC (rev 4355)
+++ trunk/libmocha-ruby/debian/changelog	2009-11-20 22:52:43 UTC (rev 4356)
@@ -1,9 +1,17 @@
-libmocha-ruby (0.9.5-2) UNRELEASED; urgency=low
+libmocha-ruby (0.9.8-1) UNRELEASED; urgency=low
 
+  [ Gunnar Wolf ]
   * Changed section to Ruby as per ftp-masters' request
 
- -- Gunnar Wolf <gwolf at debian.org>  Tue, 21 Apr 2009 15:54:12 -0500
+  [ Antonio Terceiro ]
+  * New upstream release.
+  * debian/copyright:
+    + Updating licensing information according to upstream README file.
+    + Relicensing the Debian packaging under the same terms as the original
+      package.
 
+ -- Antonio Terceiro <terceiro at softwarelivre.org>  Fri, 20 Nov 2009 19:55:16 -0300
+
 libmocha-ruby (0.9.5-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libmocha-ruby/debian/copyright
===================================================================
--- trunk/libmocha-ruby/debian/copyright	2009-11-20 19:51:38 UTC (rev 4355)
+++ trunk/libmocha-ruby/debian/copyright	2009-11-20 22:52:43 UTC (rev 4356)
@@ -7,16 +7,8 @@
 
 Copyright © 2006 Revieworld Ltd.
 
-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:
+You may use, copy and redistribute this library under the same terms as Ruby
+itself or under the MIT license.
 
-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.
-
-setup.rb is Copyright © 2000-2004 Minero Aoki and is distirbuted under the
-terms of the GNU LGPL, Lesser General Public License version 2.1. See
-`/usr/share/common-licenses/LGPL-2.1'.
-
 The Debian packaging is © 2007-2009, Antonio Terceiro <terceiro at softwarelivre.org>
-and is licensed under the GPL version 2 or later version as published by the
-Free Software Foundation, see `/usr/share/common-licenses/GPL-2'.
+and is licensed under the same terms as the original package.