[scummvm] 01/02: New upstream release
Stephen Kitt
skitt at moszumanska.debian.org
Sat Mar 10 22:17:57 UTC 2018
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository scummvm.
commit 277916b3ba344c557ed3e411495286f606e8ac0d
Author: Stephen Kitt <skitt at debian.org>
Date: Sat Mar 10 21:09:17 2018 +0100
New upstream release
---
debian/changelog | 26 +++++----
debian/copyright | 101 +++++++++++++++++++++++++++++++++--
debian/patches/disable-arm-asm.patch | 32 -----------
debian/patches/series | 2 -
debian/patches/wno-format.patch | 22 --------
debian/scummvm.lintian-overrides | 2 +
6 files changed, 115 insertions(+), 70 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8d27a39..cca4b30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scummvm (2.0.0+dfsg-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New upstream release, merging all patches. Closes: #886317.
+
+ -- Stephen Kitt <skitt at debian.org> Sat, 10 Mar 2018 20:42:59 +0100
+
scummvm (1.9.0+dfsg-2) unstable; urgency=medium
* Team upload.
@@ -155,7 +162,7 @@ scummvm (1.5.0+dfsg-1) unstable; urgency=low
scummvm (1.4.1-1) unstable; urgency=low
* New upstream release
- * Install translations.dat into scummvm-data
+ * Install translations.dat into scummvm-data
-- Moritz Muehlenhoff <jmm at debian.org> Sat, 14 Jan 2012 11:39:15 +0100
@@ -166,7 +173,7 @@ scummvm (1.4.0-1) unstable; urgency=low
* Remove Build-Conflicts on liboss-salsa-dev and disable ALSA on
kfreebsd (Closes: #647124)
* Bump debhelper level to 9, which enables default build flags
- and thus hardened compiler flags
+ and thus hardened compiler flags
-- Moritz Muehlenhoff <jmm at debian.org> Sat, 05 Nov 2011 10:29:43 +0100
@@ -220,7 +227,7 @@ scummvm (1.2.0-1) unstable; urgency=low
* Update to standards version 3.9.1:
- Modify asound build dep to linux-any
* Unversion several build deps even supported in oldstable
-
+
-- Moritz Muehlenhoff <jmm at debian.org> Tue, 12 Oct 2010 21:49:29 +0200
scummvm (1.1.1-1) unstable; urgency=low
@@ -228,7 +235,7 @@ scummvm (1.1.1-1) unstable; urgency=low
* New upstream release
* Switch to bz2 upstream tarball
* Disable SCI engine as requested by upstream, it's not yet ready to
- replace FreeSCI
+ replace FreeSCI
-- Moritz Muehlenhoff <jmm at debian.org> Fri, 07 May 2010 18:57:09 +0200
@@ -280,14 +287,14 @@ scummvm (1.0.0~rc1-1-1) unstable; urgency=low
* Remove dh_desktop
* Version the dependency on debhelper
* Bump Standards-Version to 3.8.1, no changes needed
- * Update copyright file
+ * Update copyright file
-- Moritz Muehlenhoff <jmm at debian.org> Tue, 01 Sep 2009 22:11:17 +0200
scummvm (0.13.1-1) unstable; urgency=low
* New upstream release (Closes: #530863)
- * Bump Standards-Version to 3.8.1, add Homepage field
+ * Bump Standards-Version to 3.8.1, add Homepage field
* Bump debhelper level to 7
* Build-depend on ghostscript instead of gs-gpl
* Build-depend on texlive-base instead of tetex-bin
@@ -301,7 +308,7 @@ scummvm (0.13.0-1) unstable; urgency=low
* Move maintainer to Debian Games Team, add myself and David as
uploaders
* Fix link to compability matrix in package description
- (Closes: #508894)
+ (Closes: #508894)
-- Moritz Muehlenhoff <jmm at debian.org> Sat, 07 Mar 2009 01:18:12 +0100
@@ -341,7 +348,7 @@ scummvm (0.9.1-1) unstable; urgency=low
* New upstream release
* debian/prepare: refer to me instead
- * debian/copyright: add the date I adopted the package
+ * debian/copyright: add the date I adopted the package
-- David Weinehall <tao at debian.org> Mon, 30 Oct 2006 16:44:12 +0200
@@ -581,7 +588,7 @@ scummvm (0.5.0-1) unstable; urgency=low
* Restructure 00buildopts somewhat, to ease future maintenance.
* Standards-Version 3.6.0, no changes required.
* Revised the description.
- * Sponsored by Joey Hess. (Tore fed me all the beer I could take ..
+ * Sponsored by Joey Hess. (Tore fed me all the beer I could take ..
and then asked me to do this. ;-)
-- Tore Anderson <tore at linpro.no> Fri, 1 Aug 2003 21:45:06 +0200
@@ -702,4 +709,3 @@ scummvm (0.1.0b-1) unstable; urgency=low
Ole !
-- Bastien Nocera <hadess at hadess.net> Fri, 5 Apr 2002 16:37:09 +0100
-
diff --git a/debian/copyright b/debian/copyright
index bd2068a..38071b1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,7 +14,7 @@ Files-Excluded:
Files: *
Copyright:
- 2001-2016 The ScummVM Project
+ 2001-2017 The ScummVM Project
The ScummVM Team
2002-2011 The DOSBox Team
1994-1998 Revolution Software Ltd.
@@ -31,12 +31,79 @@ 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/mods/mod_xm_s3m.* audio/mods/module_mod_xm_s3m.*
+Copyright: 2015 Martin Cameron
+License: GPL-2+
+Comment:
+ This code is based on IBXM mod player
+ .
+ Copyright (c) 2015, Martin Cameron
+ 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 of the organization 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 THE COPYRIGHT HOLDERS AND
+ CONTRIBUTORS "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 COPYRIGHT HOLDER 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.
+
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
+Copyright: 2003-2006,2008-2009,2011-2016 Dean Beeler
+ 2003-2006,2008-2009,2011-2016 Jerome Fisher
+ 2011-2017 Sergey V. Mikayev
License: LGPL-2.1+
+Files: audio/softsynth/mt32/sha1/*
+Copyright: 2011 Micael Hildenborg
+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 of Micael Hildenborg 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 Micael Hildenborg ''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 Micael Hildenborg 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/fat/*
Copyright: Michael Chisholm <chishm at hotmail.com>
License: MC-custom
@@ -97,6 +164,31 @@ Copyright:
1995-1997 Presto Studios, Inc.
License: GPL-2+
+Files: common/safe-bool.h
+Copyright: TODO
+License: Boost-1.0
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ 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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN 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:
2001-2016 The ScummVM Team
@@ -318,6 +410,7 @@ Copyright: 2002 Bastien Nocera <hadess at hadess.net>
2003,2006-2008 David Weinehall <tao at debian.org>
2012-2016 Dmitry Smirnov <onlyjob at debian.org>
2009-2012 Moritz Muehlenhoff <jmm at debian.org>
+ 2018 Stephen Kitt <skitt at debian.org>
2002-2005 Tore Anderson <tore at linpro.no>
License: GPL-2+
diff --git a/debian/patches/disable-arm-asm.patch b/debian/patches/disable-arm-asm.patch
deleted file mode 100644
index 59e6a0d..0000000
--- a/debian/patches/disable-arm-asm.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Last-Update: 2016-03-15
-Forwarded: http://sourceforge.net/p/scummvm/bugs/6810/
-Bug-Debian: https://bugs.debian.org/779029
-From: Konstantinos Margaritis <markos at freevec.org>
-Description: disable arm asm
- Disable asm optimizatons for ARM sytems to prevent a crash and
- segmentation fault when running ScummVM on these platforms.
-
---- a/configure
-+++ b/configure
-@@ -2196,17 +2196,17 @@
- arm-apple-darwin11)
- ;;
-
- *)
-- define_in_config_if_yes yes 'USE_ARM_SCALER_ASM'
-+# define_in_config_if_yes yes 'USE_ARM_SCALER_ASM'
- # FIXME: The following feature exhibits a bug. It produces distorted
- # sound since 9003ce517ff9906b0288f9f7c02197fd091d4554. The ARM
- # assembly will need to be properly adapted to the changes to the C
- # code in 8f5a7cde2f99de9fef849b0ff688906f05f4643e.
- # See bug #6957: "AUDIO: ARM ASM sound code causes distorted audio on 32 bit armv6"
-- #define_in_config_if_yes yes 'USE_ARM_SOUND_ASM'
-- define_in_config_if_yes yes 'USE_ARM_SMUSH_ASM'
-- define_in_config_if_yes yes 'USE_ARM_GFX_ASM'
-+# #define_in_config_if_yes yes 'USE_ARM_SOUND_ASM'
-+# define_in_config_if_yes yes 'USE_ARM_SMUSH_ASM'
-+# define_in_config_if_yes yes 'USE_ARM_GFX_ASM'
- # FIXME: The following feature exhibits a bug during the intro scene of Indy 4
- # (on Pandora and iPhone at least)
- #define_in_config_if_yes yes 'USE_ARM_COSTUME_ASM'
- ;;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b1da962..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-disable-arm-asm.patch
-wno-format.patch
diff --git a/debian/patches/wno-format.patch b/debian/patches/wno-format.patch
deleted file mode 100644
index 27b4cbf..0000000
--- a/debian/patches/wno-format.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Avoid -Wno-format
-Author: Stephen Kitt <skitt at debian.org>
-
-We don’t build with -Werror, and our combination of flags causes
-errors with -Wno-format, so avoid disabling -Wformat altogether.
-
---- a/test/module.mk
-+++ b/test/module.mk
-@@ -14,13 +14,6 @@
- TEST_LDFLAGS := $(LIBS)
- TEST_CXXFLAGS := $(filter-out -Wglobal-constructors,$(CXXFLAGS))
-
--ifdef HAVE_GCC3
--# In test/common/str.h, we test a zero length format string. This causes GCC
--# to generate a warning which in turn poses a problem when building with -Werror.
--# To work around this, we disable -Wformat here.
--TEST_CFLAGS += -Wno-format
--endif
--
- # Enable this to get an X11 GUI for the error reporter.
- #TEST_FLAGS += --gui=X11Gui
- #TEST_LDFLAGS += -L/usr/X11R6/lib -lX11
diff --git a/debian/scummvm.lintian-overrides b/debian/scummvm.lintian-overrides
new file mode 100644
index 0000000..d534bb2
--- /dev/null
+++ b/debian/scummvm.lintian-overrides
@@ -0,0 +1,2 @@
+# The zlib files are just wrappers around the library
+scummvm: embedded-library usr/games/scummvm: zlib
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm.git
More information about the Pkg-games-commits
mailing list