[DRE-commits] [SCM] ruby-rspec-expectations.git branch, master, updated. upstream/2.5.0-11-gd3fb90e

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 8137fbf75424f18846dc39ba048da02b9b97ce4a
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Mon Feb 13 09:06:17 2012 +0100

    adapt copyright file to newest DEP-5 spec and update info

diff --git a/debian/changelog b/debian/changelog
index 631bdcc..3653d5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ ruby-rspec-expectations (2.8.0-1) unstable; urgency=low
 
   * New upstream version
   * Add myself to Uploaders:
+  * Update license name, copyright holders, DEP-5 format in copyright file
 
- -- Cédric Boutillier <cedric.boutillier at gmail.com>  Mon, 13 Feb 2012 08:58:13 +0100
+ -- Cédric Boutillier <cedric.boutillier at gmail.com>  Mon, 13 Feb 2012 09:03:15 +0100
 
 ruby-rspec-expectations (2.5.0-2) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 2d72cc8..6fb8e54 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,19 @@
-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-expectations
 Source: https://github.com/rspec/rspec-expectations
 
 Files: *
-Copyright:
- Copyright (c) 2005 The RSpec Development Team
-License: MIT
+Copyright: Copyright 2005 Steven Baker
+           Copyright 2006 David Chelimsky
+           Copyright 2006 The RSpec Development Team
+License: Expat
+
+Files: debian/*
+Copyright: Copyright 2011 Lucas Nussbaum <lucas at lucas-nussbaum.net>
+           Copyright 2012 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 +21,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.
@@ -24,7 +32,3 @@ License: MIT
  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.
-
-Files: debian/*
-Copyright: Copyright 2011 Lucas Nussbaum <lucas at lucas-nussbaum.net>
-License: MIT

-- 
ruby-rspec-expectations.git