[dreamchess] 23/80: add a patch to force dreamchess to use mxml from Debian

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository dreamchess.

commit c096ca3569dc1e90f532e77dabd79490dbd91e0f
Author: Gonéri Le Bouder <goneri at rulezlan.org>
Date:   Sun Jan 7 00:40:55 2007 +0000

    add a patch to force dreamchess to use mxml from Debian
---
 debian/control                           |  2 +-
 debian/patches/series                    |  1 +
 debian/patches/use_mxml_from_debian.diff | 57 ++++++++++++++++++++++++++++++++
 debian/rules                             |  3 +-
 4 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 59b734e..d813dc6 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org> 
 Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>, Paul Bell <ubuntu at dpb.org.uk>
 Build-Depends: debhelper (>= 5.0.0), autotools-dev, libsdl-image1.2-dev,
- libsdl1.2-dev
+ quilt, libsdl1.2-dev, libmxml-dev
 Standards-Version: 3.7.2
 
 Package: dreamchess
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..498d6cf
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use_mxml_from_debian.diff
diff --git a/debian/patches/use_mxml_from_debian.diff b/debian/patches/use_mxml_from_debian.diff
new file mode 100644
index 0000000..2ccb3da
--- /dev/null
+++ b/debian/patches/use_mxml_from_debian.diff
@@ -0,0 +1,57 @@
+diff -ru dreamchess-0.1.0/configure.ac dreamchess-0.1.0.encours/configure.ac
+--- dreamchess-0.1.0/configure.ac	2006-09-24 03:36:59.000000000 +0200
++++ dreamchess-0.1.0.encours/configure.ac	2007-01-07 01:23:39.000000000 +0100
+@@ -309,7 +309,6 @@
+ 		src/Makefile
+ 		src/libs/Makefile
+ 		src/libs/gamegui/Makefile
+-		src/libs/mxml/Makefile
+ 		src/libs/minizip/Makefile
+ 		src/include/Makefile
+ 		src/include/gamegui/Makefile
+diff -ru dreamchess-0.1.0/src/libs/Makefile.am dreamchess-0.1.0.encours/src/libs/Makefile.am
+--- dreamchess-0.1.0/src/libs/Makefile.am	2006-08-26 22:38:25.000000000 +0200
++++ dreamchess-0.1.0.encours/src/libs/Makefile.am	2007-01-07 01:25:02.000000000 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = gamegui mxml minizip
++SUBDIRS = gamegui minizip
+ EXTRA_DIST = msgbuf.h
+ INCLUDES = -I$(top_srcdir)/src/include
+ AM_YFLAGS = -p san
+diff -ru dreamchess-0.1.0/src/Makefile.am dreamchess-0.1.0.encours/src/Makefile.am
+--- dreamchess-0.1.0/src/Makefile.am	2006-09-24 03:36:59.000000000 +0200
++++ dreamchess-0.1.0.encours/src/Makefile.am	2007-01-07 01:25:47.000000000 +0100
+@@ -4,7 +4,7 @@
+ EXTRA_DIST = win32.rc win32.ico beos.rdef
+ bin_PROGRAMS = dreamchess
+ INCLUDES = -I$(top_srcdir)/src/include
+-AM_CFLAGS = $(CFLAGS) @DATADIR@ @SDL_CFLAGS@
++AM_CFLAGS = $(CFLAGS) @DATADIR@ @SDL_CFLAGS@ -lmxml
+ BUILT_SOURCES = pgn_parser.h
+ AM_YFLAGS = -d
+ 
+@@ -13,11 +13,11 @@
+ 	comm_win32.c credits.c pgn_parser.y pgn_scanner.l
+ 
+ dreamchess_LDADD = @WIN32_RC@ libs/libsan.a ui_sdlgl/libui_sdlgl.a \
+-	libs/gamegui/libgamegui.a libs/mxml/libmxml.a @DREAMCHESS_LIBS@ \
++	libs/gamegui/libgamegui.a @DREAMCHESS_LIBS@ \
+ 	@SDL_LIBS@
+ 
+ dreamchess_DEPENDENCIES = @WIN32_RC@ libs/libsan.a ui_sdlgl/libui_sdlgl.a \
+-	libs/gamegui/libgamegui.a libs/mxml/libmxml.a @DREAMCHESS_LIBS@
++	libs/gamegui/libgamegui.a @DREAMCHESS_LIBS@
+ 
+ win32_rc.$(OBJEXT):
+ 	@WINDRES@ win32.rc win32_rc.$(OBJEXT)
+diff -ru dreamchess-0.1.0/src/ui_sdlgl/Makefile.am dreamchess-0.1.0.encours/src/ui_sdlgl/Makefile.am
+--- dreamchess-0.1.0/src/ui_sdlgl/Makefile.am	2006-09-04 01:43:21.000000000 +0200
++++ dreamchess-0.1.0.encours/src/ui_sdlgl/Makefile.am	2007-01-07 01:26:53.000000000 +0100
+@@ -1,6 +1,6 @@
+ noinst_HEADERS = ui_sdlgl_3d.h ui_sdlgl.h
+ noinst_LIBRARIES = libui_sdlgl.a
+-AM_CFLAGS = $(CFLAGS) @DATADIR@ @SDL_CFLAGS@
++AM_CFLAGS = $(CFLAGS) @DATADIR@ @SDL_CFLAGS@ -lmxml
+ INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src
+ libui_sdlgl_a_SOURCES = ui_sdlgl.c ui_sdlgl_3d.c texture.c draw_shape.c text.c colours.c \
+ system.c vkeyboard.c ingame_ui.c draw_scene.c get_move.c theme.c transitions.c credits.c \
diff --git a/debian/rules b/debian/rules
index c103219..6e1c8e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,7 @@ endif
 
 config.status: configure
 	dh_testdir
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	touch ChangeLog # Fix the incorrect date of this file
 	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --bindir=/usr/games --datadir=/usr/share/games
 
@@ -51,7 +52,7 @@ endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	dh_clean 
 
 install: build

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