This is an automated email from the git hooks/post-receive script. onlyjob pushed a commit to branch master in repository scummvm.
commit d90f30a (HEAD, master) Author: Dmitry Smirnov <[email protected]> Date: Tue Mar 15 00:49:38 2016 New upstream release [1.8.0] + changelog summary. --- debian/changelog | 17 ++++++-- debian/copyright | 84 ++++++++++++++++++++---------------- debian/patches/disable-arm-asm.patch | 54 +++++++++++------------ debian/patches/drop1test.patch | 24 ----------- debian/patches/format-security.patch | 57 ++++++++++++++++++++++++ debian/patches/series | 2 +- 6 files changed, 145 insertions(+), 93 deletions(-) diff --git a/debian/changelog b/debian/changelog index d8b7a90..6fa3dc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,6 @@ -scummvm (1.7.0+dfsg-3) UNRELEASED; urgency=medium +scummvm (1.8.0+dfsg-1) UNRELEASED; urgency=medium + + * New upstream release [March 2016]. [ Alexandre Detiste ] * Use HTTPS for Vcs URLs. @@ -13,8 +15,17 @@ scummvm (1.7.0+dfsg-3) UNRELEASED; urgency=medium * Fixed in new upstream release 1.8.0: + Spelling mistake in Spanish translation of Lure of the Temptress: "obsevar" -> "observar" has been fixed upstream (Closes: #805215). - - -- Dmitry Smirnov <[email protected]> Fri, 04 Mar 2016 23:39:14 +1100 + * clean: remove "config.mk". + * Removed obsolete "drop1test.patch". + * Switch to libsdl2 (Closes: #807710): + + New "libsdl2.patch" to find "sdl2-config"; + + Build-Depends: + - libsdl1.2-dev + + libsdl2-dev | libsdl1.2-dev + * Added "format-security.patch" to fix FTBFS. + * Build with full hardening. + + -- Dmitry Smirnov <[email protected]> Tue, 15 Mar 2016 10:07:19 +1100 scummvm (1.7.0+dfsg-2) unstable; urgency=medium diff --git a/debian/copyright b/debian/copyright index b543bdb..0091f40 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,43 +13,40 @@ Files-Excluded: */*/*/*.dll Files: * -Copyright: 2001-2014 The ScummVM Project - 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 +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-2013 Dean Beeler - 2003-2006,2008-2009,2011-2013 Jerome Fisher - 2011-2013 Sergey V. Mikayev +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: audio/softsynth/mt32/freeverb.* -Copyright: not-applicable -License: Public-Domain - This code is public domain - -Files: backends/platform/ds/arm9/source/fat/.* +Files: backends/platform/ds/arm9/source/fat/* Copyright: Michael Chisholm <[email protected]> -License: +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 [email protected] 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.* + 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, @@ -76,7 +73,7 @@ License: BSD-3-clause Files: backends/platform/ds/arm9/source/interrupt.s backends/platform/ds/arm9/source/keys.cpp Copyright: 2005 Dave Murphy (WinterMute) -License: BSD-3-clause +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. @@ -93,9 +90,26 @@ License: BSD-3-clause 3. This notice may not be removed or altered from any source distribution. -Files: engines/sword25/util/pluto/* -Copyright: 2004 by Ben Sunshine-Hill -License: +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 [email protected] + 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. @@ -103,14 +117,8 @@ License: 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: released into the public domain. - People making use of this software as part of an application - are politely requested to email the author at [email protected] - with a brief description of the application, primarily to satisfy his - curiosity. Files: engines/sword25/util/lua/* - engines/sword25/util/pluto/pdep/* Copyright: 1994-2008 Lua.org, PUC-Rio. License: Expat Permission is hereby granted, free of charge, to any person obtaining a copy @@ -137,7 +145,7 @@ Comment: Files: engines/wintermute/utils/convert_utf.* Copyright: 2001-2004 Unicode, Inc. -License: +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 @@ -156,7 +164,7 @@ License: Files: engines/wintermute/utils/crc.* Copyright: 2000 Michael Barr -License: +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 @@ -181,7 +189,7 @@ License: GPL-3+ Files: gui/themes/fonts/clR6x12*.bdf Copyright: 1989 Dale Schumacher <[email protected]> -License: +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 @@ -201,7 +209,7 @@ License: public-domain Files: gui/themes/fonts/helv*.bdf Copyright: 1984-1989,1994 Adobe Systems Incorporated. 1988,1994 Digital Equipment Corporation. -License: +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 @@ -293,7 +301,7 @@ License: LGPL-2.1+ Files: debian/* Copyright: 2002 Bastien Nocera <[email protected]> 2003,2006-2008 David Weinehall <[email protected]> - 2012-2014 Dmitry Smirnov <[email protected]> + 2012-2016 Dmitry Smirnov <[email protected]> 2009-2012 Moritz Muehlenhoff <[email protected]> 2002-2005 Tore Anderson <[email protected]> License: GPL-2+ diff --git a/debian/patches/disable-arm-asm.patch b/debian/patches/disable-arm-asm.patch index a2b06b9..ce11235 100644 --- a/debian/patches/disable-arm-asm.patch +++ b/debian/patches/disable-arm-asm.patch @@ -1,32 +1,32 @@ -From: Konstantinos Margaritis <[email protected]> -Date: Sat, 28 Feb 2015 18:46:02 +0100 -Subject: disable arm asm - -Disable asm optimizatons for ARM sytems to prevent a crash and -segmentation fault when running ScummVM on these platforms. - +Last-Update: 2016-03-15 Forwarded: http://sourceforge.net/p/scummvm/bugs/6810/ Bug-Debian: https://bugs.debian.org/779029 ---- - configure | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) +From: Konstantinos Margaritis <[email protected]> +Description: disable arm asm + Disable asm optimizatons for ARM sytems to prevent a crash and + segmentation fault when running ScummVM on these platforms. -diff --git a/configure b/configure -index 0635907..d3391e7 100755 --- a/configure +++ b/configure -@@ -2027,10 +2027,10 @@ echo_n "Checking host CPU architecture... " - case $_host_cpu in - arm*) - echo "ARM" -- define_in_config_if_yes yes 'USE_ARM_SCALER_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' -+ # define_in_config_if_yes yes 'USE_ARM_SCALER_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' +@@ -2085,17 +2085,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/drop1test.patch b/debian/patches/drop1test.patch deleted file mode 100644 index faadccd..0000000 --- a/debian/patches/drop1test.patch +++ /dev/null @@ -1,24 +0,0 @@ -Last-Update: 2014-08-09 -Forwarded: not-needed -Origin: https://github.com/scummvm/scummvm/commit/bb70ea04e963a99f164a152db0ad2d9830a94d25 -Bug-ScummVM: https://sourceforge.net/p/scummvm/bugs/6697/ -Description: drop problematic test - TEST: Remove odd test in rendermode tests. - This specific test checked whether the pointer for two static strings have a - different address. Since the specific strings checked had the same "value" - string pooling optimizations will result in them to have the same address and - thus make this test fail. Furthermore, the test seemed completely pointless, - I simply dropped it now. - ---- a/test/common/rendermode.h -+++ b/test/common/rendermode.h -@@ -48,9 +48,8 @@ - * What does getRenderModeCode return? - * Notably, the output should not be in mixed case. - */ - TS_ASSERT_SAME_DATA(Common::getRenderModeCode(Common::parseRenderMode("FMTOWNS")), "fmtowns", 7); -- TS_ASSERT_DIFFERS(Common::getRenderModeCode(Common::parseRenderMode("FMTOWNS")), "fmtowns"); - TS_ASSERT_SAME_DATA(Common::getRenderModeCode(Common::parseRenderMode("CGA")), "cga", 3); - TS_ASSERT_SAME_DATA(Common::getRenderModeCode(Common::parseRenderMode("vga")), "vga", 3); - TS_ASSERT_SAME_DATA(Common::getRenderModeCode(Common::parseRenderMode("Ega")), "ega", 3); - TS_ASSERT_SAME_DATA(Common::getRenderModeCode(Common::parseRenderMode("AmiGa")), "amiga", 5); diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch new file mode 100644 index 0000000..109730d --- /dev/null +++ b/debian/patches/format-security.patch @@ -0,0 +1,57 @@ +Last-Update: 2016-03-15 +Forwarded: no +Author: Dmitry Smirnov <[email protected]> +Description: fix FTBFS. + +--- a/engines/sherlock/tattoo/tattoo_darts.cpp ++++ b/engines/sherlock/tattoo/tattoo_darts.cpp +@@ -177,9 +177,9 @@ + } else { + scoredPoints = Common::String::format(FIXED(DartsScoredPoints), lastDart); + } + +- screen.print(Common::Point(_dartInfo.left, _dartInfo.top + _spacing), 0, scoredPoints.c_str()); ++ screen.print(Common::Point(_dartInfo.left, _dartInfo.top + _spacing), 0, "%s", scoredPoints.c_str()); + } else { + Common::String hitText; + + if (lastDart != 25) { +@@ -212,9 +212,9 @@ + default: + break; + } + } +- screen.print(Common::Point(_dartInfo.left, _dartInfo.top + _spacing), 0, hitText.c_str()); ++ screen.print(Common::Point(_dartInfo.left, _dartInfo.top + _spacing), 0, "%s", hitText.c_str()); + } + + if (score != 0 && playerNum == 0 && !gameOver) + screen.print(Common::Point(_dartInfo.left, _dartInfo.top + _spacing * 3), 0, +@@ -416,14 +416,14 @@ + int temp = (_gameType == GAME_CRICKET) ? STATUS_INFO_Y + 10 * _spacing + 5 : STATUS_INFO_Y + 55; + + // "Round: x" + Common::String dartsRoundStatus = Common::String::format(FIXED(DartsCurrentRound), _roundNum); +- screen.print(Common::Point(STATUS_INFO_X, temp), 0, dartsRoundStatus.c_str()); ++ screen.print(Common::Point(STATUS_INFO_X, temp), 0, "%s", dartsRoundStatus.c_str()); + + if (_gameType == GAME_301) { + // "Turn Total: x" + Common::String dartsTotalPoints = Common::String::format(FIXED(DartsCurrentTotalPoints), _roundScore); +- screen.print(Common::Point(STATUS_INFO_X, STATUS_INFO_Y + 75), 0, dartsTotalPoints.c_str()); ++ screen.print(Common::Point(STATUS_INFO_X, STATUS_INFO_Y + 75), 0, "%s", dartsTotalPoints.c_str()); + } else { + // Show cricket scores + for (int x = 0; x < 7; ++x) { + screen.print(Common::Point(STATUS_INFO_X, STATUS_INFO_Y + 40 + x * _spacing), 0, "%s:", CRICKET_SCORE_NAME[x]); +@@ -934,9 +934,9 @@ + erasePowerBars(); + + // "Dart # x" + Common::String currentDart = Common::String::format(FIXED(DartsCurrentDart), dartNum); +- screen.print(Common::Point(_dartInfo.left, _dartInfo.top), 0, currentDart.c_str()); ++ screen.print(Common::Point(_dartInfo.left, _dartInfo.top), 0, "%s", currentDart.c_str()); + + drawDartsLeft(dartNum, computer); + + if (!computer) { diff --git a/debian/patches/series b/debian/patches/series index 9355e26..979c9d9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ -drop1test.patch disable-arm-asm.patch +format-security.patch libsdl2.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
