[DRE-commits] [SCM] ruby-rspec.git branch, master, updated. upstream/2.5.0-9-g696f08d

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 3d958a32e6dcb8d4f4bb56b6e32e5af9912c9e3c
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Wed Feb 15 13:55:38 2012 +0100

    update copyright info

diff --git a/debian/copyright b/debian/copyright
index 5449932..cc4355f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,20 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=173
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: rspec
 Source: https://github.com/rspec/rspec
 
 Files: *
-Copyright:
- Copyright (c) 2005 The RSpec Development Team
-License: MIT
+Copyright: Copyright 2009 Chad Humphries
+           Copyright 2006, 2009 David Chelimsky,
+           Copyright 2006 The RSpec Development Team
+           Copyright 2005 Steven Baker 
+License: Expat
+
+Files: debian/*
+Copyright: Copyright 2011 Lucas Nussbaum <lucas at lucas-nussbaum.net>
+           Copyright 2011 Cédric Boutillier <cedric.boutillier at gmail.com> 
+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
@@ -13,10 +22,10 @@ License: MIT
  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.
@@ -25,6 +34,3 @@ License: MIT
  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-Files: debian/*
-Copyright: Copyright 2011 Lucas Nussbaum <lucas at lucas-nussbaum.net>
-License: MIT

-- 
ruby-rspec.git