[DRE-commits] [rails-3.2] 05/07: complete debian/copyright

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository rails-3.2.

commit fd1fade150bfb9504990aad474c9adad16313c86
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Jan 16 12:06:57 2014 +0100

    complete debian/copyright
---
 debian/copyright | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index 47cf1ba..bbeff5e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,35 @@ Source: https://github.com/rails/rails
 
 Files: *
 Copyright: Copyright 2004-2013 David Heinemeier Hansson
-License: Expat
+License: MIT
+
+Files: railties/lib/rails/commands/plugin.rb
+Copyright: copyright 2005 by Ryan Tomayko (rtomayko at gmail.com)
+License: MIT
+
+Files: railties/guides/assets/javascripts/syntaxhighlighter/*
+Copyright: Copyright (C) 2004-2010 Alex Gorbatchev
+License: MIT or GPL
+
+License: MIT
+ 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.
 
 Files: guides/assets/javascripts/syntaxhighlighter/*.js
        guides/assets/stylesheets/syntaxhighlighter/*.css

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