[DRE-commits] [SCM] ruby-openid.git branch, master, updated. debian/2.1.8debian-3

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 254925947d9faef5fb7db2910bc86136e576cfe8
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Sat May 19 13:38:36 2012 +0200

    Added missing files and license paragraphs to debian/copyright for examples/rails_openid/public/javascripts/*.js.

diff --git a/debian/changelog b/debian/changelog
index 1984113..abde710 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-openid (2.1.8debian-3) unstable; urgency=low
+
+  * Added missing files and license paragraphs to debian/copyright for
+    examples/rails_openid/public/javascripts/*.js.
+
+ -- Paul van Tilburg <paulvt at debian.org>  Sat, 19 May 2012 13:37:34 +0200
+
 ruby-openid (2.1.8debian-2) unstable; urgency=low
 
   [ Paul van Tilburg ]
diff --git a/debian/copyright b/debian/copyright
index 7e89cbd..9f9faff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,6 +13,15 @@ Files: lib/openid/yadis/htmltokenizer.rb
 Copyright: 2004 Ben Giddings
 License: Ruby or GPL-2
 
+Files: examples/rails_openid/public/javascripts/*.js
+Copyright: 2005-2008, Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+License: Expat
+
+Files: examples/rails_openid/public/javascripts/prototype.js
+Copyright: 2005, Sam Stephenson <sam at conio.net>
+License: Expat
+Comment: License referred to as MIT license.
+
 Files: debian/*
 Copyright: 2007 Antonio Terceiro <terceiro at softwarelivre.org>
            2012 Cédric Boutillier <cedric.boutillier at gmail.com>
@@ -23,6 +32,25 @@ License: Apache-2.0
  On Debian systems, the full text of the Apache License 2.0 can be found at
  /usr/share/common-licenses/Apache-2.0.
 
+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 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.
+
 License: GPL-2
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License Version 2 as published

-- 
ruby-openid.git