[scummvm] 02/02: New upstream release [1.8.1] + changelog summary
Dmitry Smirnov
onlyjob at moszumanska.debian.org
Sun Jun 5 15:08:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
onlyjob pushed a commit to branch master
in repository scummvm.
commit 373842b (HEAD, master)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Sun Jun 5 14:29:51 2016
New upstream release [1.8.1] + changelog summary
---
debian/changelog | 11 +++++++
debian/control | 2 ++
debian/patches/disable-arm-asm.patch | 2 +-
debian/patches/format-security.patch | 58 ------------------------------------
debian/patches/libsdl2.patch | 8 ++---
debian/patches/series | 1 -
6 files changed, 18 insertions(+), 64 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dbd8dfb..7ac83dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+scummvm (1.8.1+dfsg-1) unstable; urgency=medium
+
+ * New upstream release [May 2016].
+ * Standards-Version: 3.9.8.
+ * Removed obsolete "format-security.patch".
+ * Build-Depends:
+ + libfreetype6-dev
+ + libpng-dev
+
+ -- Dmitry Smirnov <onlyjob at debian.org> Mon, 06 Jun 2016 00:28:50 +1000
+
scummvm (1.8.0+dfsg-1) unstable; urgency=low
* New upstream release [March 2016].
diff --git a/debian/control b/debian/control
index 60d3ba0..cbaa694 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,11 @@ Build-Depends: debhelper (>= 9), autotools-dev
,libfaad-dev
,libflac-dev
,libfluidsynth-dev
+ ,libfreetype6-dev
,libjpeg-dev
,libmad0-dev
,libmpeg2-4-dev
+ ,libpng-dev
,libsdl2-dev | libsdl1.2-dev
,libtheora-dev
,libvorbis-dev
diff --git a/debian/patches/disable-arm-asm.patch b/debian/patches/disable-arm-asm.patch
index ce11235..2c545b5 100644
--- a/debian/patches/disable-arm-asm.patch
+++ b/debian/patches/disable-arm-asm.patch
@@ -8,7 +8,7 @@ Description: disable arm asm
--- a/configure
+++ b/configure
-@@ -2085,17 +2085,17 @@
+@@ -2126,17 +2126,17 @@
arm-apple-darwin11)
;;
diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch
deleted file mode 100644
index 65e7d25..0000000
--- a/debian/patches/format-security.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Last-Update: 2016-03-15
-Forwarded: not-needed
-Origin: upstream, https://github.com/scummvm/scummvm/commit/305e34a718a0e433e859d1a35e654747deb3fad7
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-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/libsdl2.patch b/debian/patches/libsdl2.patch
index 6089550..8e8ae31 100644
--- a/debian/patches/libsdl2.patch
+++ b/debian/patches/libsdl2.patch
@@ -1,15 +1,15 @@
-Last-Update: 2016-03-15
+Last-Update: 2016-06-06
Forwarded: https://github.com/scummvm/scummvm/pull/707
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Description: search for "sdl2-config"
--- a/configure
+++ b/configure
-@@ -180,9 +180,9 @@
- _stagingpath="staging"
- _win32path="c:/scummvm"
+@@ -184,9 +184,9 @@
_amigaospath="Games:ScummVM"
_staticlibpath=
+ _xcodetoolspath=
+ _sparklepath=
-_sdlconfig=sdl-config
+_sdlconfig=sdl2-config
_freetypeconfig=freetype-config
diff --git a/debian/patches/series b/debian/patches/series
index 979c9d9..855d5fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
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
More information about the Pkg-games-commits
mailing list