[DRE-commits] [SCM] ruby-ffi.git branch, master, updated. 6530561f06ac4d832a4ad681da63f02a2e979722

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 6530561f06ac4d832a4ad681da63f02a2e979722
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Wed Sep 14 11:04:24 2011 -0700

    Adjust copyright file

diff --git a/debian/copyright b/debian/copyright
index 0489949..8f7dd13 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,9 +3,15 @@ Upstream-Name: ffi
 Source: https://github.com/ffi/ffi
 
 Files: *
-Copyright: Copyright (c) 2008, 2009 Ruby FFI contributors
+Copyright: Copyright (c) 2008-2010 Ruby FFI contributors
+License: LGPL-3
+
+Files: ./ext/ffi_c/StructByReference.*
+Copyright: Copyright (c) 2010, Wayne Meissner
 License:
- Redistribution and use in source and binary forms, with or without 
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .
  * Redistributions of source code must retain the above copyright notice, this
@@ -13,46 +19,24 @@ License:
  * 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.
- * Neither the name of the JRuby Project nor the names of its contributors 
-   may be used to endorse or promote products derived from this software 
-   without specific prior written permission.
+ * The name of the author or authors may not be used to endorse or promote
+   products derived from this software without specific prior written permission.
  .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
 
-Files: ext/ffi_c/libffi
-Copyright: Copyright (c) 1996-2009  Anthony Green, Red Hat, Inc and others.  
-Comment: See source files for details.
-License:
- 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: debian/*
-Copyright: (c) 2010, Micah Anderson <micah at debian.org>
+Copyright:
+ Copyright (c) 2010, Micah Anderson <micah at debian.org>
+ Copyright (c) 2011, Antonio Terceiro <terceiro at debian.org>
 License:
  The Debian packaging is distributed under the same terms as the original
  package.

-- 
ruby-ffi.git