[jumpnbump] 01/03: apply two more patches from the upstream master branch

[Fabian Greffrath]

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

fabian pushed a commit to branch master
in repository jumpnbump.

commit 2bf1b7da684715d1d850c1d4c00cda2b9500e902
Author: Fabian Greffrath <fabian at debian.org>
Date:   Tue Jun 27 21:41:27 2017 +0200

    apply two more patches from the upstream master branch
    
    - dist: fix some meta-data syntax
    - Makefile: Fix occasional parallel FTBFS
      Thanks Adrian Bunk (Closes: #865813)
---
 .../0003-dist-fix-some-meta-data-syntax.patch      | 38 ++++++++++++++++++++++
 ...04-Makefile-Fix-occasional-parallel-FTBFS.patch | 32 ++++++++++++++++++
 debian/patches/series                              |  4 ++-
 3 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/debian/patches/0003-dist-fix-some-meta-data-syntax.patch b/debian/patches/0003-dist-fix-some-meta-data-syntax.patch
new file mode 100644
index 0000000..69f327d
--- /dev/null
+++ b/debian/patches/0003-dist-fix-some-meta-data-syntax.patch
@@ -0,0 +1,38 @@
+From 90084d7939e6eb49f3c2aa81465324d87bbb967b Mon Sep 17 00:00:00 2001
+From: Fabian Greffrath <fabian at greffrath.com>
+Date: Sat, 24 Jun 2017 20:13:39 +0200
+Subject: [PATCH 3/4] dist: fix some meta-data syntax
+
+- fix lexgrog parsing error in the man page NAME section
+- add Keywords field to .desktop files
+---
+ dist/jumpnbump-menu.desktop | 1 +
+ dist/jumpnbump.6            | 4 ++--
+ dist/jumpnbump.desktop      | 1 +
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+--- a/dist/jumpnbump-menu.desktop
++++ b/dist/jumpnbump-menu.desktop
+@@ -7,3 +7,4 @@ Icon=jumpnbump
+ Terminal=false
+ Type=Application
+ Categories=Game;ArcadeGame;
++Keywords=cute;game;bunnies;rabbits;jump;head;explode;gore;
+--- a/dist/jumpnbump.6
++++ b/dist/jumpnbump.6
+@@ -1,6 +1,6 @@
+-.TH jumpnbump 6 "August 25th, 2002"
++.TH "Jump 'n Bump" 6 "August 25th, 2002"
+ .SH NAME
+-Jump 'n Bump \- Cute multiplayer platform game with bunnies
++jumpnbump \- Cute multiplayer platform game with bunnies
+ .SH SYNOPSIS
+ jumpnbump \fR[\fB-dat \fIlevelname\fR] [\fB-port \fIport \fB-net \fIplayer hostname rport\fR] [\fB-fullscreen\fR] [\fB-nosound\fR] [\fB-musicnosound\fR] [\fB-nogore\fR] [\fB-noflies\fR] [\fB-mirror\fR] [\fB-scaleup\fR] [\fB-v\fR] [\fB-h\fR]
+ .SH DESCRIPTION
+--- a/dist/jumpnbump.desktop
++++ b/dist/jumpnbump.desktop
+@@ -7,3 +7,4 @@ Icon=jumpnbump
+ Terminal=false
+ Type=Application
+ Categories=Game;ArcadeGame;
++Keywords=cute;game;bunnies;rabbits;jump;head;explode;gore;
diff --git a/debian/patches/0004-Makefile-Fix-occasional-parallel-FTBFS.patch b/debian/patches/0004-Makefile-Fix-occasional-parallel-FTBFS.patch
new file mode 100644
index 0000000..c89c0c6
--- /dev/null
+++ b/debian/patches/0004-Makefile-Fix-occasional-parallel-FTBFS.patch
@@ -0,0 +1,32 @@
+From 78f4945474f36a6f40e6661152bc92336f0371bc Mon Sep 17 00:00:00 2001
+From: Adrian Bunk <bunk at debian.org>
+Date: Mon, 26 Jun 2017 08:37:49 +0200
+Subject: [PATCH 4/4] Makefile: Fix occasional parallel FTBFS
+
+"cd modify && make" was running up to three times in parallel.
+Fixes #21.
+---
+ Makefile | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -25,14 +25,16 @@ MODIFY_TARGET = gobpack$(EXE) jnbpack$(E
+ OBJS = main.o menu.o filter.o network.o
+ BINARIES = $(TARGET) $(MODIFY_TARGET)
+ 
+-.PHONY: data
++.PHONY: data modify
+ 
+ all: $(BINARIES) jnbmenu
+ 
+ $(SDL_TARGET): globals.h
+ 	$(MAKE) -C sdl
+ 
+-$(MODIFY_TARGET): globals.h
++$(MODIFY_TARGET): modify
++
++modify: globals.h
+ 	$(MAKE) -C modify
+ 
+ $(TARGET): $(OBJS) $(SDL_TARGET) data globals.h
diff --git a/debian/patches/series b/debian/patches/series
index 7fd3260..5d34a2b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
-0002-menu-Make-python-shebang-more-explicit.patch
 0001-appdata-Fix-invalid-homepage-and-screenshot-URLs.patch
+0002-menu-Make-python-shebang-more-explicit.patch
+0003-dist-fix-some-meta-data-syntax.patch
+0004-Makefile-Fix-occasional-parallel-FTBFS.patch

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