[DRE-commits] [SCM] ruby-rr.git branch, master, updated. debian/1.0.4-1-7-g66b92f8

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit ec43062dc9bccab3320bacd8a62bdc8305e56f5c
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Apr 26 23:24:26 2013 +0530

    update debian/copyright
    
    - make format verion 1.0
    - merge two license fields

diff --git a/debian/copyright b/debian/copyright
index 8ea1a54..2422e4d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,34 +1,17 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: rr
 Source: https://github.com/btakita/rr
 
 Files: *
 Copyright: 2010 Brian Takita
-License: 
- 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:
+           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

-- 
ruby-rr.git