[DRE-commits] [rails] 01/01: debian/control: mention jquery licensing

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository rails.

commit 0c5cee88ac6e70d37d173d50bc0437fc1fe1ad4b
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Nov 27 18:07:03 2014 -0200

    debian/control: mention jquery licensing
---
 debian/changelog |  7 +++++++
 debian/copyright | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ff85cf3..270157c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rails (2:4.1.8-2) UNRELEASED; urgency=medium
+
+  * debian/copyright: fix mention to the license of
+    guides/assets/javascripts/jquery.min.js
+
+ -- Antonio Terceiro <terceiro at debian.org>  Thu, 27 Nov 2014 18:06:50 -0200
+
 rails (2:4.1.8-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/copyright b/debian/copyright
index 08be865..af1a1f2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,6 +11,11 @@ Files: guides/*
 Copyright: Copyright 2004-2013 David Heinemeier Hansson
 License: CC-BY-3.0
 
+Files: guides/assets/javascripts/jquery.min.js
+Copyright: Copyright 2011, John Resig
+ Copyright 2011, The Dojo Foundation
+License: Expat or BSD or GPL
+
 Files: guides/assets/javascripts/syntaxhighlighter/*.js
        guides/assets/stylesheets/syntaxhighlighter/*.css
 Copyright: 2004-2010 Alex Gorbatchev
@@ -400,3 +405,30 @@ License: CC-BY-3.0
      not granted under this License, such additional rights are deemed
      to be included in the License; this License is not intended to
      restrict the license of any rights under applicable law.
+
+License: BSD
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.

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