[DRE-commits] [SCM] ruby-sinatra-contrib.git branch, master, updated. upstream/1.3.1-13-ge1e3940

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 368430caec7dafcc607927d1e37b2c6005a694eb
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Mar 14 22:39:27 2013 +0100

    Improve debian/copyright
    
    The policy recommends to specify Expat instead of "the MIT license" when it
    matches which is the case here.
    
    spec/okjson.rb is under another copyright, so it needs to be listed
    separately.

diff --git a/debian/copyright b/debian/copyright
index b8e64ea..758074b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,10 +3,14 @@ Upstream-Name: sinatra-contrib
 Source: https://github.com/sinatra/sinatra-contrib
 
 Files: *
-Copyright: Copyright 2008-2011 Nicolas Sanguinetti, entp.com, Konstantin Haase
-License: The MIT License
- Copyright (c) 2008-2011 Nicolas Sanguinetti, entp.com, Konstantin Haase
- .
+Copyright: 2008-2011 Nicolas Sanguinetti, entp.com, Konstantin Haase
+License: Expat
+
+Files: spec/okjson.rb
+Copyright: 2011 Keith Rarick <kr at xph.us>
+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 restriction, including

-- 
ruby-sinatra-contrib.git