[SCM] mess system emulator branch, master, updated. 4a690f8f26fee02ea8ffe1fba4cf5355ca8ea366

[Emmanuel Kasper]

The following commit has been merged in the master branch:
commit c83f5a023ca7e8a7c78250111ad733d808e16a43
Author: Emmanuel Kasper <emmanuel at libera.cc>
Date:   Sun May 13 00:17:34 2012 +0200

    Add full text of BSD license

diff --git a/debian/copyright b/debian/copyright
index d2cb68d..b2b063c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -826,14 +826,6 @@ License: MAME
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
-License: BSD-3-clause
- On Debian systems, the full text of the BSD three clauses license can be found
- in the file /usr/share/common-licenses/BSD
-
-License: GPL-2
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file /usr/share/common-licenses/GPL-2.
-
 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 as published by
@@ -860,11 +852,6 @@ License: GPL-3+
  On Debian systems, the full text of the GNU General Public
  License version 3 can be found in the file /usr/share/common-licenses/GPL-3.
 
-License: LGPL-2.1
-  On Debian systems, the full text of the GNU Lesser General Public
- License version 2.1 can be found in the file 
- /usr/share/common-licenses/LGPL-2.1
-
 License: LGPL-2.1+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as published by
@@ -885,5 +872,39 @@ License: LGPL-2.1+
  License version 2.1 can be found in the file 
  /usr/share/common-licenses/LGPL-2.1
 
+License: BSD-3-clause
+ 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 list of conditions and the following disclaimer.
+        * 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 'MAME' 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 AARON GILES ''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 AARON GILES 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.
+
+License: GPL-2
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file /usr/share/common-licenses/GPL-2.
 
+License: LGPL-2.1
+  On Debian systems, the full text of the GNU Lesser General Public
+ License version 2.1 can be found in the file 
+ /usr/share/common-licenses/LGPL-2.1
 

-- 
mess system emulator