[SCM] mess system emulator branch, master, updated. bee6ce2f00a5d7a7061dc5c20daed6a047f96424

[Emmanuel Kasper]

The following commit has been merged in the master branch:
commit b847aeb320c13abd0ebf062a45e038fdd2caf4f7
Author: Emmanuel Kasper <emmanuel at libera.cc>
Date:   Fri Dec 30 17:55:45 2011 +0100

    Add SPDX style short name for bsd-3-clause licensed files

diff --git a/debian/copyright b/debian/copyright
index dc6e9ca..c7e3d86 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -559,34 +559,6 @@ Files: src/osd/osdepend.c
  src/mess/mess_dev.lst
 Copyright: Aaron Giles
 License: BSD-3-clause
-    Copyright Aaron Giles
-    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 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.
 
 Files: src/lib/expat/*
 Copyright: 1998, 1999, 2000 Thai Open Source Software Center Ltd
@@ -854,6 +826,10 @@ 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.
@@ -909,3 +885,5 @@ License: LGPL-2.1+
  License version 2.1 can be found in the file 
  /usr/share/common-licenses/LGPL-2.1
 
+
+

-- 
mess system emulator