[SCM] packaging for the mame arcade game emulator branch, master, updated. 57b670e7094cb6897f6f3585c5e66261f3e54261
Emmanuel Kasper
emmanuel at libera.cc
Fri Dec 30 16:58:13 UTC 2011
The following commit has been merged in the master branch:
commit 57b670e7094cb6897f6f3585c5e66261f3e54261
Author: Emmanuel Kasper <emmanuel at libera.cc>
Date: Fri Dec 30 17:57:36 2011 +0100
Add SPDX style short name for bsd-3-clause licensed files
diff --git a/debian/copyright b/debian/copyright
index e39113c..ff2a28e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -509,34 +509,6 @@ Files: src/osd/osdepend.c
src/mame/mame_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
@@ -1008,6 +980,10 @@ License: CC-BY-3.0
License; this License is not intended to restrict the license of any
rights under applicable law.
+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.
@@ -1063,3 +1039,5 @@ License: LGPL-2.1+
License version 2.1 can be found in the file
/usr/share/common-licenses/LGPL-2.1
+
+
--
packaging for the mame arcade game emulator
More information about the Pkg-games-commits
mailing list