[SCM] Packaging for fairymax branch, master, updated. debian/4.8m-1-6-g6549cc2

[Vincent Legout]

The following commit has been merged in the master branch:
commit 1325cae28042aa9ffc68833353ca614ea093182c
Author: Vincent Legout <vincent at legout.info>
Date:   Sat Jan 23 13:13:41 2010 +0800

    New upstream version

diff --git a/debian/changelog b/debian/changelog
index 6dafd37..8f47aba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+fairymax (4.8o-1) unstable; urgency=low
+
+  * New upstream version:
+    - Remove patches, they have been merged upstream. Remove quilt dependency
+  * debian/rules:
+    - Update get-orig-source target
+    - Remove override_dh_auto_configure, no longer needed
+    - Update clean target
+  * debian/fairymax.manpages: Removed
+
+ -- Vincent Legout <vincent at legout.info>  Sat, 23 Jan 2010 12:53:43 +0800
+
 fairymax (4.8m-1) unstable; urgency=low
 
   * New upstream version (Closes: #544874)
diff --git a/debian/control b/debian/control
index cc1e723..7902299 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Vincent Legout <vincent at legout.info>
-Build-Depends: debhelper (>= 7.0.50~), quilt
+Build-Depends: debhelper (>= 7.0.50~)
 Standards-Version: 3.8.3
 Homepage: http://home.hccnet.nl/h.g.muller/CVfairy.html
 Vcs-Git: git://git.debian.org/git/pkg-games/fairymax.git
diff --git a/debian/fairymax.manpages b/debian/fairymax.manpages
deleted file mode 100644
index a81a7ae..0000000
--- a/debian/fairymax.manpages
+++ /dev/null
@@ -1 +0,0 @@
-fairymax.6
diff --git a/debian/patches/01_fix_ini_files_default_location b/debian/patches/01_fix_ini_files_default_location
deleted file mode 100644
index 0abde6e..0000000
--- a/debian/patches/01_fix_ini_files_default_location
+++ /dev/null
@@ -1,29 +0,0 @@
-# Description: fix the ini files default location
-# Author: Gonéri Le Bouder <goneri at rulezlan.org>
-
-Index: fairymax/fairymax.c
-===================================================================
---- 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>
- 
- #ifndef INI_FILE 
--#define INI_FILE "fmax.ini"
-+#define INI_FILE "/usr/share/games/fairymax/fmax.ini"
- #endif
- 
- #ifdef WIN32 
-Index: fairymax/maxqi.c
-===================================================================
---- 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 QINI_FILE 
--#define QINI_FILE "qmax.ini"
-+#define QINI_FILE "/usr/share/games/fairymax/qmax.ini"
- #endif
- 
- #else
diff --git a/debian/patches/02_Makefile b/debian/patches/02_Makefile
deleted file mode 100644
index 7cd6e2e..0000000
--- a/debian/patches/02_Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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
deleted file mode 100644
index 67ba63c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-01_fix_ini_files_default_location
-02_Makefile
diff --git a/debian/rules b/debian/rules
index 9c0f2bf..5362dc9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,17 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with quilt $@
-
-override_dh_auto_configure:
-	gzip -cd changelog.gz > Changelog
-	gzip -cd fairymax.6.gz > fairymax.6
-	sed -i "s/FMAX.6 1/FMAX.6 6/" fairymax.6
+	dh $@
 
 override_dh_auto_clean:
 	dh_auto_clean
-	$(RM) -f fairymax.6 Changelog
+	rm -f fmax.man
 
-VERSION=4.8m
+VERSION=4.8o
 
 get-orig-source:
 	wget -c http://home.hccnet.nl/h.g.muller/fairymax.tar.gz
-	mv fairymax.tar.gz fairymax_$(VERSION).orig.tar.gz
+	tar zxvf fairymax.tar.gz
+	mv Fairy-Max fairymax-$(VERSION)
+	tar czf fairymax-$(VERSION).orig.tar.gz fairymax-$(VERSION)
+	rm -rf fairymax-$(VERSION) fairymax.tar.gz

-- 
Packaging for fairymax