[DRE-commits] [ruby-execjs] 02/09: d/copyright rearranged, updated, and made more compliant

[Caitlin Matos]

This is an automated email from the git hooks/post-receive script.

cm-guest pushed a commit to branch master
in repository ruby-execjs.

commit aa43261e7d42298f44608ce78e8f381db8367c58
Author: Caitlin Matos <caitlin.matos at zoho.com>
Date:   Thu Jul 24 20:24:41 2014 -0400

    d/copyright rearranged, updated, and made more compliant
---
 debian/copyright | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 4e830a6..685d1a9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,9 +3,23 @@ Upstream-Name: execjs
 Source: https://github.com/sstephenson/execjs
 
 Files: *
-Copyright: 2011 Sam Stephenson
- 2011 Josh Peek.
-License: MIT
+Copyright:  2011-2014 Sam Stephenson <sstephenson at gmail.com>
+	    2011-2014 Josh Peek <josh at joshpeek.com>
+License: Expat
+
+Files: debian/*
+Copyright: 2012 Antonio Terceiro <terceiro at debian.org>
+License: Expat
+
+Files: debian/ruby-tests.rb
+Copyright:  2012 Antonio Terceiro
+	    2011-2012 Sam Stephenson
+	    2011-2012 Josh Peek
+License: Expat
+ This file is a slightly modified version of test/test_execjs.rb present in the
+ upstream Git repository.
+
+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 without limitation the rights
@@ -23,20 +37,3 @@ License: MIT
  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: *
-Copyright: 2011 Sam Stephenson
- 2011 Josh Peek.
-License: MIT
-
-Files: debian/*
-Copyright: 2012 Antonio Terceiro <terceiro at debian.org>
-License: MIT
-
-Files: debian/ruby-tests.rb
-Copyright: 2011 Sam Stephenson
- 2011 Josh Peek.
-License: MIT
-Comment:
- This file is a slightly modified version of test/test_execjs.rb present in the
- upstream Git repository.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-execjs.git