[mupen64plus-core] 103/310: Add new files to debian/copyright

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit e2677a3ff180fd95a0775630ca702c088e9753ac
Author: Sven Eckelmann <sven at narfation.org>
Date:   Mon Aug 29 11:28:51 2011 +0200

    Add new files to debian/copyright
---
 debian/changelog |  1 +
 debian/copyright | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 53d9799..5e9a711 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ mupen64plus-core (1.99.5~hg20110828-1) UNRELEASED; urgency=low
       privilege_segfault.patch, rewrite_makefile.patch, rjump_globber.patch,
       rtc.patch
     - Rebase dejavu-font.patch and printf_fixup.patch against 1.99.5~hg20110828
+  * Add new files to debian/copyright
 
  -- Sven Eckelmann <sven at narfation.org>  Sun, 28 Aug 2011 18:58:27 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 386c01d..0fa2472 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -128,6 +128,10 @@ Copyright: 2008, DarkJeztr
            2008, Richard 'Richard42' Goedeken <Richard at fascinationsoftware.com>
 License: GPL-2+
 
+Files: src/memory/n64_cic_nus_6105.*
+Copyright: 2011, X-Scale
+License: BSD-2-clause
+
 Files: src/memory/pif2.h
 Copyright: 2002, Zilmar
 License: GPL-2+
@@ -162,6 +166,10 @@ Copyright: 2002, Hacktarux
            2002, Richard 'Richard42' Goedeken <Richard at fascinationsoftware.com>
 License: GPL-2+
 
+Files: src/r4300/fpu.h
+Copyright: 2010, Ari64
+License: GPL-2+
+
 Files: data/font.ttf
 Copyright: 2003 Bitstream, Inc.
 License: other
@@ -277,3 +285,24 @@ License: Zlib
  3. This notice may not be removed or altered from any source distribution.
  .
  This code is a modified version of crypting code in Infozip distribution
+
+License: BSD-2-clause
+ 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.
+ .
+ THIS SOFTWARE IS PROVIDED BY X-Scale ``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 X-Scale 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-games/mupen64plus-core.git