DISTS/DEBIAN: Update to current files from downstream, less patches

One patch is eliminated by the previous commit; the other patch,
for ARM, is going to get fixed one way or the other by either
landing gh-1052 or actually having the ARM assembly not be broken
any more (or the first one first, and then the second one later
when someone has enough time to do the work and test it).

Fixes Trac#7105.

1 files changed, 373 insertions, 41 deletions

diff --git a/dists/debian/copyright b/dists/debian/copyright
index 0123b2886c..bd2068aa1a 100644
--- a/dists/debian/copyright
+++ b/dists/debian/copyright
@@ -1,41 +1,373 @@
-ScummVM was debianized by Bastien Nocera <hadess@hadess.net> the 5th Apr 2002.
-It was adopted by Tore Anderson <tore@linpro.no> the 4th Oct 2002,
-then adopted by David Weinehall <tao@debian.org> the 30th Jan 2006,
-then adopted by the Debian Games Team by Moritz Muehlenhoff <jmm@debian.org>
-
-It was downloaded from <http://www.scummvm.org/>.
-
-Upstream Authors: see `/usr/share/doc/scummvm/AUTHORS'.
-
-ScummVM is Copyright © 2002-2017 The ScummVM Team
-
- 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 the
- Free Software Foundation; either version 2, or (at your option) any
- later version.
-
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'.
-
-This copyright also applies to the Debian-related build scripts.
-
-Some parts of ScummVM (the mt32 softsynth code) is covered by a more
-permissive BSD-style 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.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ScummVM
+Source: http://www.scummvm.org/
+Comment:
+ ScummVM was debianized by Bastien Nocera <hadess@hadess.net> the 5th Apr 2002.
+ It was adopted by Tore Anderson <tore@linpro.no> the 4th Oct 2002,
+ then adopted by David Weinehall <tao@debian.org> the 30th Jan 2006,
+ then adopted by the Debian Games Team by Moritz Muehlenhoff <jmm@debian.org>
+Files-Excluded:
+    gui/themes/fonts/topaz
+    gui/themes/fonts/Arial*
+    */*/*/*/*.o*
+    */*/*/*.dll
+
+Files: *
+Copyright:
+    2001-2016 The ScummVM Project
+              The ScummVM Team
+    2002-2011 The DOSBox Team
+    1994-1998 Revolution Software Ltd.
+    2001-2004 Andrea Mazzoleni
+    2003-2005 Andreas 'Sprawl' Karlsso
+    2002-2008 Jurgen 'SumthinWicked' Braam
+    2003-2014 Lars 'AnotherGuest' Persso
+    2013-2014 Fedor Strizhniou
+    1990-2012 Neil Dodwell
+    1995-1997 Presto Studios, Inc.
+              and others listed in COPYRIGHT file
+License: GPL-2+
+Comment:
+ See list of copyright holders in "/usr/share/doc/scummvm/COPYRIGHT".
+ See list of upstream authors in "/usr/share/doc/scummvm/AUTHORS".
+
+Files: audio/softsynth/mt32/*
+Copyright: 2003-2006,2008-2009,2011-2014 Dean Beeler
+           2003-2006,2008-2009,2011-2014 Jerome Fisher
+           2011-2014                     Sergey V. Mikayev
+License: LGPL-2.1+
+
+Files: backends/platform/ds/arm9/source/fat/*
+Copyright: Michael Chisholm <chishm@hotmail.com>
+License: MC-custom
+ This software is completely free. No warranty is provided.
+ If you use it, please give me credit and email me about your
+ project at chishm@hotmail.com
+
+Files: backends/platform/ds/arm9/source/fat/io_m3_common.*
+       backends/platform/ds/arm9/source/fat/io_njsd.*
+       backends/platform/ds/arm9/source/fat/io_sd_*
+Copyright: 2006 Michael "Chishm" Chisholm
+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:
+ .
+  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.
+  3. The name of the author may not be used to endorse or promote products derived
+     from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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: backends/platform/ds/arm9/source/interrupt.s
+       backends/platform/ds/arm9/source/keys.cpp
+Copyright: 2005 Dave Murphy (WinterMute)
+License: BSD-3-clause~dm
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any
+ damages arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any
+ purpose, including commercial applications, and to alter it and
+ redistribute it freely, subject to the following restrictions:
+    1.      The origin of this software must not be misrepresented; you
+            must not claim that you wrote the original software. If you use
+            this software in a product, an acknowledgment in the product
+            documentation would be appreciated but is not required.
+    2.      Altered source versions must be plainly marked as such, and
+            must not be misrepresented as being the original software.
+    3.      This notice may not be removed or altered from any source
+            distribution.
+
+Files:
+    engines/pegasus/interaction.cpp
+Copyright:
+    2001-2016 The ScummVM Team
+    1995-1997 Presto Studios, Inc.
+License: GPL-2+
+
+Files: engines/sword25/util/lua_*
+Copyright:
+    2001-2016 The ScummVM Team
+    2004 Ben Sunshine-Hill
+License: GPL-2+
+Comment:
+ This code is heavily based on the Pluto code base.
+ Copyright (C) 2004 by Ben Sunshine-Hill, and released into the public
+ domain. People making use of this software as part of an application
+ are politely requested to email the author at sneftel@gmail.com
+ with a brief description of the application, primarily to satisfy his
+ curiosity.
+ .
+ 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: engines/sword25/util/lua/*
+Copyright: 1994-2008 Lua.org, PUC-Rio.
+License: Expat
+
+Files: engines/wintermute/utils/convert_utf.*
+Copyright: 2001-2004 Unicode, Inc.
+License: unicode
+ This source code is provided as is by Unicode, Inc. No claims are
+ made as to fitness for any particular purpose. No warranties of any
+ kind are expressed or implied. The recipient agrees to determine
+ applicability of information provided. If this file has been
+ purchased on magnetic or optical media from Unicode, Inc., the
+ sole remedy for any claim will be exchange of defective media
+ within 90 days of receipt.
+ .
+ Limitations on Rights to Redistribute This Code
+ .
+ Unicode, Inc. hereby grants the right to freely use the information
+ supplied in this file in the creation of products supporting the
+ Unicode Standard, and to make copies of this file in any form
+ for internal or external distribution as long as this notice
+ remains attached.
+
+Files: engines/wintermute/utils/crc.*
+Copyright: 2000 Michael Barr
+License: public-domain-crc
+ This software is placed into
+ the public domain and may be used for any purpose. However, this
+ notice must not be changed or removed and no warranty is either
+ expressed or implied by its publication or distribution.
+
+Files:
+    engines/wage/combat.cpp
+    engines/wage/design.cpp
+    engines/wage/design.h
+    engines/wage/dialog.cpp
+    engines/wage/dialog.h
+    engines/wage/entities.cpp
+    engines/wage/entities.h
+    engines/wage/gui-console.cpp
+    engines/wage/gui.cpp
+    engines/wage/gui.h
+    engines/wage/randomhat.cpp
+    engines/wage/randomhat.h
+    engines/wage/saveload.cpp
+    engines/wage/script.cpp
+    engines/wage/script.h
+    engines/wage/sound.cpp
+    engines/wage/sound.h
+    engines/wage/util.cpp
+    engines/wage/wage.cpp
+    engines/wage/wage.h
+    engines/wage/world.cpp
+    engines/wage/world.h
+Copyright:
+    2001-2016 The ScummVM Project
+    2009      Alexei Svitkine, Eugene Sandulenko
+License: GPL-2+ and Expat
+
+Files:
+    graphics/nine_patch.cpp
+    graphics/nine_patch.h
+Copyright:
+    2001-2016 The ScummVM Project
+    2011      Matthew Leverton
+License: GPL-2+ and Expat
+
+Files: gui/themes/fonts/Free*.ttf
+       gui/themes/scummmodern/Free*.ttf
+Copyright: 2002-2009 Free Software Foundation.
+License: GPL-3+
+ 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
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ The complete text of the GNU General Public License can be found
+ in "/usr/share/common-licenses/GPL-3".
+
+Files: gui/themes/fonts/clR6x12*.bdf
+Copyright: 1989 Dale Schumacher <dal@syntel.mn.org>
+License: MIT-like
+ Permission to use, copy, modify, and distribute this software and
+ its documentation for any purpose and without fee is hereby
+ granted, provided that the above copyright notice appear in all
+ copies and that both that copyright notice and this permission
+ notice appear in supporting documentation, and that the name of
+ Dale Schumacher not be used in advertising or publicity pertaining to
+ distribution of the software without specific, written prior
+ permission.  Dale Schumacher makes no representations about the
+ suitability of this software for any purpose.  It is provided "as
+ is" without express or implied warranty.
+
+Files: gui/themes/fonts/fixed5x8*.bdf
+Copyright: not-applicable
+License: public-domain
+ Public domain font.  Share and enjoy.
+
+Files: gui/themes/fonts/helv*.bdf
+Copyright: 1984-1989,1994 Adobe Systems Incorporated.
+           1988,1994      Digital Equipment Corporation.
+License: MIT-Adobe-DEC
+ Adobe is a trademark of Adobe Systems Incorporated which may be
+ registered in certain jurisdictions.
+ Permission to use these trademarks is hereby granted only in
+ association with the images described in this file.
+ .
+ Permission to use, copy, modify, distribute and sell this software
+ and its documentation for any purpose and without fee is hereby
+ granted, provided that the above copyright notices appear in all
+ copies and that both those copyright notices and this permission
+ notice appear in supporting documentation, and that the names of
+ Adobe Systems and Digital Equipment Corporation not be used in
+ advertising or publicity pertaining to distribution of the software
+ without specific, written prior permission.  Adobe Systems and
+ Digital Equipment Corporation make no representations about the
+ suitability of this software for any purpose.  It is provided "as
+ is" without express or implied warranty.
+
+Files: graphics/yuv_to_rgb.cpp
+Copyright: 2001-2012 The ScummVM Project
+License: GPL-2+
+Comment: portions copyright as below
+ The YUV to RGB conversion code is derived from SDL's YUV overlay code, which
+ in turn appears to be derived from mpeg_play. The following copyright
+ notices have been included in accordance with the original license. Please
+ note that the term "software" in this context only applies to the
+ buildLookup() and plotYUV*() functions below.
+ .
+ Copyright (c) 1995 The Regents of the University of California.
+ All rights reserved.
+ .
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose, without fee, and without written agreement is
+ hereby granted, provided that the above copyright notice and the following
+ two paragraphs appear in all copies of this software.
+ .
+ IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ .
+ THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ .
+ Copyright (c) 1995 Erik Corry
+ All rights reserved.
+ .
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose, without fee, and without written agreement is
+ hereby granted, provided that the above copyright notice and the following
+ two paragraphs appear in all copies of this software.
+ .
+ IN NO EVENT SHALL ERIK CORRY BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+ SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
+ THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ERIK CORRY HAS BEEN ADVISED
+ OF THE POSSIBILITY OF SUCH DAMAGE.
+ .
+ ERIK CORRY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
+ BASIS, AND ERIK CORRY HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
+ UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ .
+ Portions of this software Copyright (c) 1995 Brown University.
+ All rights reserved.
+ .
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose, without fee, and without written agreement
+ is hereby granted, provided that the above copyright notice and the
+ following two paragraphs appear in all copies of this software.
+ .
+ IN NO EVENT SHALL BROWN UNIVERSITY BE LIABLE TO ANY PARTY FOR
+ DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF BROWN
+ UNIVERSITY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ .
+ BROWN UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
+ BASIS, AND BROWN UNIVERSITY HAS NO OBLIGATION TO PROVIDE MAINTENANCE,
+ SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+Files: test/cxxtest/*
+Copyright: 2008 Sandia Corporation
+License: LGPL-2.1+
+
+Files: debian/*
+Copyright: 2002            Bastien Nocera <hadess@hadess.net>
+           2003,2006-2008  David Weinehall <tao@debian.org>
+           2012-2016       Dmitry Smirnov <onlyjob@debian.org>
+           2009-2012       Moritz Muehlenhoff <jmm@debian.org>
+           2002-2005       Tore Anderson <tore@linpro.no>
+License: 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
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ The complete text of the GNU General Public License version 2
+ can be found in `/usr/share/common-licenses/GPL-2'.
+
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU Library General Public License
+ can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
+
+License: Expat
+ 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.
+Comment:
+ This license also known as "MIT/X11 (BSD like)" or "MIT" however FSF
+ consider "MIT" labelling ambiguous and copyright-format specification
+ recommend to label such license as "Expat".