[fairymax] 03/07: Add debian/patches/makefile.patch

[Vincent Legout]

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

vlegout pushed a commit to branch master
in repository fairymax.

commit 929ef3791b4d166227ed5f14c1307b7251151196
Author: Vincent Legout <vincent at legout.info>
Date:   Fri Nov 11 09:07:47 2016 +0100

    Add debian/patches/makefile.patch
---
 debian/changelog                |  7 +++++++
 debian/patches/fix-return.patch |  6 +++---
 debian/patches/makefile.patch   | 16 ++++++++++++++++
 debian/patches/series           |  1 +
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a36f227..1ddbc90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fairymax (5.0b-1) unstable; urgency=medium
+
+  * New upstream version
+  * Add debian/patch/makefile.patch to fix install directories
+
+ -- Vincent Legout <vlegout at debian.org>  Fri, 11 Nov 2016 09:00:11 +0100
+
 fairymax (4.8v-1) unstable; urgency=medium
 
   * New upstream version
diff --git a/debian/patches/fix-return.patch b/debian/patches/fix-return.patch
index c8f43f1..741b115 100644
--- a/debian/patches/fix-return.patch
+++ b/debian/patches/fix-return.patch
@@ -8,16 +8,16 @@ Index: fairymax/fairymax.c
 ===================================================================
 --- fairymax.orig/fairymax.c
 +++ fairymax/fairymax.c
-@@ -435,7 +435,7 @@ void PrintVariants(int combo)
+@@ -474,7 +474,7 @@ void PrintVariants(int combo)
          FILE *f;
  
-         f = fopen(INI_FILE, "r");
+         f = fopen(inifile, "r");
 -        if(f==NULL) return;
 +        if(f==NULL) return 0;
  
          /* search for game names in definition file */
          do {
-@@ -498,7 +498,7 @@ void LoadGame(char *name)
+@@ -549,7 +549,7 @@ void LoadGame(char *name)
                 if(c == EOF) {
                     printf("telluser variant %s not supported\n", name);
                     fclose(f);
diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
new file mode 100644
index 0000000..68df437
--- /dev/null
+++ b/debian/patches/makefile.patch
@@ -0,0 +1,16 @@
+Description: Fix prefix and bindir
+Author: Vincent Legout <vincent at legout.info>
+
+Index: fairymax/Makefile
+===================================================================
+--- fairymax.orig/Makefile
++++ fairymax/Makefile
+@@ -1,6 +1,6 @@
+ srcdir = .
+-prefix = /usr/local
+-bindir = $(prefix)/bin
++prefix = /usr
++bindir = $(prefix)/games
+ mandir = $(prefix)/share/man
+ datadir = $(prefix)/share
+ plugindir = $(datadir)/games/plugins
diff --git a/debian/patches/series b/debian/patches/series
index 8ef142b..4dd7fcb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-return.patch
+makefile.patch

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