Author: goneri-guest
Date: 2007-09-16 20:11:13 +0000 (Sun, 16 Sep 2007)
New Revision: 4209
Modified:
packages/trunk/dreamchess/debian/changelog
packages/trunk/dreamchess/debian/patches/use_mxml_from_debian.diff
Log:
* rewrite use_mxml_from_debian.diff to avoid an autotools autoexecution
(Closes #424186, #442544)
Modified: packages/trunk/dreamchess/debian/changelog
===================================================================
--- packages/trunk/dreamchess/debian/changelog 2007-09-16 20:07:05 UTC (rev
4208)
+++ packages/trunk/dreamchess/debian/changelog 2007-09-16 20:11:13 UTC (rev
4209)
@@ -1,8 +1,10 @@
-dreamchess (0.1.0-2) UNRELEASE; urgency=low
+dreamchess (0.1.0-2) unstable; urgency=low
- * fix the watchfile
+ * fix the watchfile
+ * rewrite use_mxml_from_debian.diff to avoid an autotools autoexecution
+ (Closes #424186, #442544)
- -- Gonéri Le Bouder <[EMAIL PROTECTED]> Wed, 11 Jul 2007 21:00:40 +0200
+ -- Gonéri Le Bouder <[EMAIL PROTECTED]> Sun, 16 Sep 2007 22:28:15 +0200
dreamchess (0.1.0-1) unstable; urgency=low
Modified: packages/trunk/dreamchess/debian/patches/use_mxml_from_debian.diff
===================================================================
--- packages/trunk/dreamchess/debian/patches/use_mxml_from_debian.diff
2007-09-16 20:07:05 UTC (rev 4208)
+++ packages/trunk/dreamchess/debian/patches/use_mxml_from_debian.diff
2007-09-16 20:11:13 UTC (rev 4209)
@@ -1,36 +1,165 @@
-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 @@
+Index: dreamchess-0.1.0/configure
+===================================================================
+--- dreamchess-0.1.0.orig/configure 2007-09-16 20:06:09.000000000 +0000
++++ dreamchess-0.1.0/configure 2007-09-16 20:10:00.000000000 +0000
+@@ -1748,7 +1748,7 @@
+
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext>&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS
conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+@@ -7646,7 +7646,7 @@
+
+ # Checks for library functions.
+
+-ac_config_files="$ac_config_files Makefile desktop/Makefile doc/Makefile
man/Makefile m4/Makefile pkg/Makefile pkg/win32/Makefile src/Makefile
src/libs/Makefile src/libs/gamegui/Makefile src/libs/mxml/Makefile
src/libs/minizip/Makefile src/include/Makefile src/include/gamegui/Makefile
src/include/minizip/Makefile src/ui_sdlgl/Makefile src/dreamer/Makefile"
++ac_config_files="$ac_config_files Makefile desktop/Makefile doc/Makefile
man/Makefile m4/Makefile pkg/Makefile pkg/win32/Makefile src/Makefile
src/libs/Makefile src/libs/gamegui/Makefile src/libs/minizip/Makefile
src/include/Makefile src/include/gamegui/Makefile src/include/minizip/Makefile
src/ui_sdlgl/Makefile src/dreamer/Makefile"
+
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -8230,7 +8230,6 @@
+ "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+ "src/libs/Makefile") CONFIG_FILES="$CONFIG_FILES src/libs/Makefile" ;;
+ "src/libs/gamegui/Makefile") CONFIG_FILES="$CONFIG_FILES
src/libs/gamegui/Makefile" ;;
+- "src/libs/mxml/Makefile") CONFIG_FILES="$CONFIG_FILES
src/libs/mxml/Makefile" ;;
+ "src/libs/minizip/Makefile") CONFIG_FILES="$CONFIG_FILES
src/libs/minizip/Makefile" ;;
+ "src/include/Makefile") CONFIG_FILES="$CONFIG_FILES src/include/Makefile"
;;
+ "src/include/gamegui/Makefile") CONFIG_FILES="$CONFIG_FILES
src/include/gamegui/Makefile" ;;
+Index: dreamchess-0.1.0/src/libs/Makefile.in
+===================================================================
+--- dreamchess-0.1.0.orig/src/libs/Makefile.in 2007-09-16 20:06:09.000000000
+0000
++++ dreamchess-0.1.0/src/libs/Makefile.in 2007-09-16 20:06:12.000000000
+0000
+@@ -207,7 +207,7 @@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
-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
+Index: dreamchess-0.1.0/src/libs/mxml/Makefile.in
+===================================================================
+--- dreamchess-0.1.0.orig/src/libs/mxml/Makefile.in 2007-09-16
20:06:09.000000000 +0000
++++ dreamchess-0.1.0/src/libs/mxml/Makefile.in 2007-09-16 20:06:12.000000000
+0000
+@@ -37,7 +37,7 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+-subdir = src/libs/mxml
++subdir =
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 \
+@@ -50,13 +50,13 @@
+ LIBRARIES = $(noinst_LIBRARIES)
+ AR = ar
+ ARFLAGS = cru
+-libmxml_a_AR = $(AR) $(ARFLAGS)
+-libmxml_a_LIBADD =
+-am_libmxml_a_OBJECTS = mxml-attr.$(OBJEXT) mxml-file.$(OBJEXT) \
++#libmxml_a_AR = $(AR) $(ARFLAGS)
++#libmxml_a_LIBADD =
++#am_libmxml_a_OBJECTS = mxml-attr.$(OBJEXT) mxml-file.$(OBJEXT) \
+ mxml-node.$(OBJEXT) mxml-search.$(OBJEXT) \
+ mxml-string.$(OBJEXT) mxml-entity.$(OBJEXT) \
+ mxml-index.$(OBJEXT) mxml-private.$(OBJEXT) mxml-set.$(OBJEXT)
+-libmxml_a_OBJECTS = $(am_libmxml_a_OBJECTS)
++#libmxml_a_OBJECTS = $(am_libmxml_a_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -64,8 +64,8 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libmxml_a_SOURCES)
+-DIST_SOURCES = $(libmxml_a_SOURCES)
++#SOURCES = $(libmxml_a_SOURCES)
++#DIST_SOURCES = $(libmxml_a_SOURCES)
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -183,8 +183,8 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
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
+-noinst_LIBRARIES = libmxml.a
+-libmxml_a_SOURCES = mxml-attr.c mxml-file.c mxml-node.c mxml-search.c \
++#noinst_LIBRARIES = libmxml.a
++#libmxml_a_SOURCES = mxml-attr.c mxml-file.c mxml-node.c mxml-search.c \
+ mxml-string.c mxml-entity.c mxml-index.c mxml-private.c mxml-set.c
-@@ -13,11 +13,11 @@
+ all: all-am
+@@ -200,9 +200,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libs/mxml/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu src/libs/mxml/Makefile
++ $(AUTOMAKE) --gnu
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+@@ -223,10 +223,10 @@
+
+ clean-noinstLIBRARIES:
+ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+-libmxml.a: $(libmxml_a_OBJECTS) $(libmxml_a_DEPENDENCIES)
+- -rm -f libmxml.a
+- $(libmxml_a_AR) libmxml.a $(libmxml_a_OBJECTS) $(libmxml_a_LIBADD)
+- $(RANLIB) libmxml.a
++#libmxml.a: $(libmxml_a_OBJECTS) $(libmxml_a_DEPENDENCIES)
++# -rm -f libmxml.a
++# $(libmxml_a_AR) libmxml.a $(libmxml_a_OBJECTS) $(libmxml_a_LIBADD)
++# $(RANLIB) libmxml.a
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -234,15 +234,15 @@
+ distclean-compile:
+ -rm -f *.tab.c
+
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
+
+ .c.o:
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c
-o $@ $<; \
+Index: dreamchess-0.1.0/src/Makefile.in
+===================================================================
+--- dreamchess-0.1.0.orig/src/Makefile.in 2007-09-16 20:06:09.000000000
+0000
++++ dreamchess-0.1.0/src/Makefile.in 2007-09-16 20:12:35.000000000 +0000
+@@ -66,7 +66,7 @@
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -lmxml
+ LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
+ YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+ SOURCES = $(dreamchess_SOURCES)
+@@ -209,11 +209,11 @@
comm_win32.c credits.c pgn_parser.y pgn_scanner.l
dreamchess_LDADD = @WIN32_RC@ libs/libsan.a ui_sdlgl/libui_sdlgl.a \
@@ -42,16 +171,5 @@
- 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 \
+ all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
