[SCM] Packaging for fairymax branch, master, updated. debian/4.8j-1-15-g373929d

[Vincent Legout]

The following commit has been merged in the master branch:
commit 8cd92aebc7868217443e1f99d528f7035b47df21
Author: Vincent Legout <vincent at legout.info>
Date:   Tue Sep 29 15:22:44 2009 +0800

    Update patches

diff --git a/debian/changelog b/debian/changelog
index 51aae56..d5b45aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 fairymax (4.8m-1) unstable; urgency=low
 
   * New upstream version (Closes: #544874)
+    - Update 01_fix_ini_files_default_location patch
+    - Add 02_Makefile patch
   * debian/control:
     - Bump to Standards-Version 3.8.3
     - Build-Depend on debhelper >= 7.0.50~ to support override targets
diff --git a/debian/patches/01_fix_ini_files_default_location b/debian/patches/01_fix_ini_files_default_location
index 1190eb3..0abde6e 100644
--- a/debian/patches/01_fix_ini_files_default_location
+++ b/debian/patches/01_fix_ini_files_default_location
@@ -1,10 +1,10 @@
 # Description: fix the ini files default location
 # Author: Gonéri Le Bouder <goneri at rulezlan.org>
 
-Index: fairymax-4.8j/fairymax.c
+Index: fairymax/fairymax.c
 ===================================================================
---- fairymax-4.8j.orig/fairymax.c	2009-06-18 15:26:54.000000000 +0200
-+++ fairymax-4.8j/fairymax.c	2009-07-29 23:53:21.000000000 +0200
+--- fairymax.orig/fairymax.c	2009-09-29 14:29:29.000000000 +0800
++++ fairymax/fairymax.c	2009-09-29 15:19:24.000000000 +0800
 @@ -27,7 +27,7 @@
  #include <time.h>
  
@@ -14,23 +14,16 @@ Index: fairymax-4.8j/fairymax.c
  #endif
  
  #ifdef WIN32 
-Index: fairymax-4.8j/maxqi.c
+Index: fairymax/maxqi.c
 ===================================================================
---- fairymax-4.8j.orig/maxqi.c	2009-06-18 13:48:42.000000000 +0200
-+++ fairymax-4.8j/maxqi.c	2009-07-29 23:53:51.000000000 +0200
-@@ -88,13 +88,13 @@
+--- fairymax.orig/maxqi.c	2009-09-29 14:29:29.000000000 +0800
++++ fairymax/maxqi.c	2009-09-29 15:19:50.000000000 +0800
+@@ -89,7 +89,7 @@
  	return t.tv_sec*1000 + t.tv_usec/1000;
  }
- #ifndef INI_FILE 
--#define INI_FILE "qmax.ini"
-+#define INI_FILE "/usr/share/games/fairymax/qmax.ini"
+ #ifndef QINI_FILE 
+-#define QINI_FILE "qmax.ini"
++#define QINI_FILE "/usr/share/games/fairymax/qmax.ini"
  #endif
  
  #else
- 
- #include <windows.h>
--#define INI_FILE "qmax.ini"
-+#define INI_FILE "/usr/share/games/fairymax/qmax.ini"
- 
- #endif
- 
diff --git a/debian/patches/02_Makefile b/debian/patches/02_Makefile
new file mode 100644
index 0000000..7cd6e2e
--- /dev/null
+++ b/debian/patches/02_Makefile
@@ -0,0 +1,43 @@
+# Description: use $(DESTDIR) in Makefile
+# Author: Vincent Legout <vincent at legout.info>
+
+Index: fairymax/Makefile
+===================================================================
+--- fairymax.orig/Makefile	2009-09-29 15:20:15.000000000 +0800
++++ fairymax/Makefile	2009-09-29 15:20:42.000000000 +0800
+@@ -18,13 +18,11 @@
+ 	$(CC) $(CFLAGS) -DINI_FILE=\"/usr/share/games/fairymax/qmax.ini\" maxqi.c -o maxqi
+ 
+ install: ${ALL} ${srcdir}/data/*
+-	cp -u ${srcdir}/fairymax /usr/games
+-	cp -u ${srcdir}/shamax /usr/games
+-	cp -u ${srcdir}/maxqi /usr/games
+-	install -d -m0755 /usr/share/games/fairymax
+-	cp -u ${srcdir}/data/* /usr/share/games/fairymax
+-	install -d -m0755 /usr/share/man/man6
+-	cp -u ${srcdir}/fairymax.6.gz /usr/share/man/man6
++	cp -u ${srcdir}/fairymax $(DESTDIR)/usr/games
++	cp -u ${srcdir}/shamax $(DESTDIR)/usr/games
++	cp -u ${srcdir}/maxqi $(DESTDIR)/usr/games
++	install -d -m0755 $(DESTDIR)/usr/share/games/fairymax
++	cp -u ${srcdir}/data/* $(DESTDIR)/usr/share/games/fairymax
+ 
+ clean:
+ 	rm -f ${ALL}
+@@ -33,10 +31,10 @@
+ 	rm -f ${ALL} *~ data/*~
+ 
+ uninstall:
+-	rm -f /usr/share/games/fairymax/*
+-	rmdir /usr/share/games/fairymax
+-	rm -f /usr/share/man/man6/fairymax.6.gz
+-	rm -f /usr/games/fairymax
+-	rm -f /usr/games/shamax
+-	rm -f /usr/games/maxqi
++	rm -f $(DESTDIR)/usr/share/games/fairymax/*
++	rmdir $(DESTDIR)/usr/share/games/fairymax
++	rm -f $(DESTDIR)/usr/share/man/man6/fairymax.6.gz
++	rm -f $(DESTDIR)/usr/games/fairymax
++	rm -f $(DESTDIR)/usr/games/shamax
++	rm -f $(DESTDIR)/usr/games/maxqi
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f374d98..67ba63c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_fix_ini_files_default_location
+02_Makefile

-- 
Packaging for fairymax