[planetblupi] 07/08: merge patched-debian/master into debian/master

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 838f227d0442fb43ca41fc61203e84c4b0f487ec
Merge: 40de491 854dea4
Author: Didier Raboud <odyx at debian.org>
Date:   Wed Oct 25 09:10:21 2017 +0200

    merge patched-debian/master into debian/master

 debian/.git-dpm                                   |  4 ++--
 debian/patches/0004-Replace-a-char-by-Sint8.patch | 23 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 src/fog.cxx                                       |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 89c9c1a,0000000..b79bf6f
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 38f7702189b39c6dc4cad59ad6ef154c8cdcb58c
- 38f7702189b39c6dc4cad59ad6ef154c8cdcb58c
++854dea4aa90bce52fa6ab356042778dee5a20617
++854dea4aa90bce52fa6ab356042778dee5a20617
 +e0ace8819512553d3680e912e419a5df1b8295ab
 +e0ace8819512553d3680e912e419a5df1b8295ab
 +planetblupi_1.11.0.orig.tar.xz
 +d62eb5661224b1859f3b23afdbfbe03349e2f789
 +23135816
diff --cc debian/patches/0004-Replace-a-char-by-Sint8.patch
index 0000000,0000000..feceba0
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Replace-a-char-by-Sint8.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 854dea4aa90bce52fa6ab356042778dee5a20617 Mon Sep 17 00:00:00 2001
++From: Mathieu Schroeter <mathieu at schroetersa.ch>
++Date: Wed, 25 Oct 2017 06:40:39 +0200
++Subject: Replace a char by Sint8
++
++It should fix build on some arch like arm and ppc.
++---
++ src/fog.cxx | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/src/fog.cxx b/src/fog.cxx
++index f4d3ba2..8e6dd2f 100644
++--- a/src/fog.cxx
+++++ b/src/fog.cxx
++@@ -87,7 +87,7 @@ GetFogIcon (char * pBits)
++ // Table donnant la "vision" d'un blupi dans le
++ // brouillard.
++ // clang-format off
++-static char table_fog[17 * 17] =
+++static Sint8 table_fog[17 * 17] =
++ {
++   4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
++   4,  4,  4,  4,  4,  4,  4,  2,  4,  4,  4,  4,  4,  4,  4,  4,  4,
diff --cc debian/patches/series
index cf9f8f9,0000000..bd2c74d
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +0001-Use-GNUInstallDirs-to-let-the-BINDIR-be-overriden-by.patch
 +0002-Make-the-CURL-dependency-optional-through-the-PB_HTT.patch
 +0003-Install-a-desktop-file.patch
++0004-Replace-a-char-by-Sint8.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/planetblupi.git