[DRE-commits] [SCM] ruby-fast-gettext.git branch, master, updated. upstream/0.6.6-22-g4810852

[Dmitry Borodaenko]

The following commit has been merged in the master branch:
commit 918d095191fdf93832452e5bae225175259ec55a
Author: Dmitry Borodaenko <angdraug at debian.org>
Date:   Sat May 12 14:32:48 2012 +0300

    new upstream version 0.6.7

diff --git a/debian/changelog b/debian/changelog
index a097127..0653b93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-fast-gettext (0.6.7-1) unstable; urgency=low
+
+  * New upstream version.
+  * Upstream changed license from public domain to MIT (Expat).
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Sat, 12 May 2012 14:22:20 +0300
+
 ruby-fast-gettext (0.6.6-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/copyright b/debian/copyright
index 569924b..1b46384 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,13 +3,8 @@ Upstream-Name: fast_gettext
 Source: https://github.com/grosser/fast_gettext
 
 Files: *
-Copyright: placed under public domain by Michael Grosser
-License: public-domain
- Michael Grosser
- michael at grosser.it
- .
- Hereby placed under public domain, do what you want, just do not hold
- me accountable...
+Copyright: Michael Grosser <michael at grosser.it>
+License: Expat
 
 Files: lib/fast_gettext/vendor/iconv.rb
 Copyright: 2004-2007, Masao Mutoh <mutoh at highway.ne.jp>
@@ -33,6 +28,26 @@ Files: debian/*
 Copyright: 2011, Dmitry Borodaenko <angdraug at debian.org>
 License: GPL-2+
 
+License: Expat
+ 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.
+
 License: Ruby
  Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.jp>.
  You can redistribute it and/or modify it under either the terms of the GPL

-- 
ruby-fast-gettext.git