[DRE-commits] [SCM] ruby-rr.git branch, master, updated. upstream/1.0.5-19-gb3559bd

[TANIGUCHI Takaki]

The following commit has been merged in the master branch:
commit ccbdee85622724ffc35d79c760202b32cfafced7
Merge: fb86f9545d4703c59302db6be1f6a889e2c7e77a 9910508f58ec81a223ffc55ddc0ab09742e6c99c
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Tue May 7 09:24:15 2013 +0900

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ruby-extras/ruby-rr
    
    Conflicts:
    	debian/copyright

diff --combined debian/copyright
index 7ef7890,2422e4d..ed7308d
--- a/debian/copyright
+++ b/debian/copyright
@@@ -4,31 -4,14 +4,14 @@@ Source: https://github.com/btakita/r
  
  Files: *
  Copyright: 2010 Brian Takita
- License: other
-  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: Expat
  
  Files: debian/*
  Copyright: 2011 TANIGUCHI Takaki <takaki at debian.org>
- License: other
+            2013 Praveen Arimbrathodiyil <praveen at debian.org>
+ License: Expat
+ 
+ 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
@@@ -49,4 -32,3 +32,4 @@@
   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-rr.git