Patch information for gnome-hearts (0.3-2) 01_gnome_cards

diff -Naur gnome-hearts-0.2/pixmaps/Makefile.am gnome-hearts-0.2.patched/pixmaps/Makefile.am
--- gnome-hearts-0.2/pixmaps/Makefile.am	2007-09-08 00:10:41.000000000 +0200
+++ gnome-hearts-0.2.patched/pixmaps/Makefile.am	2007-10-16 21:36:15.000000000 +0200
@@ -10,7 +10,4 @@
 pixmapdir = $(datadir)/pixmaps/gnome-hearts
 pixmap_DATA = baize.png
 
-cardsdir = $(datadir)/pixmaps/gnome-hearts/cards
-cards_DATA = dondorf.svg
-
-EXTRA_DIST = $(icon_DATA) $(glade_DATA) $(pixmap_DATA) $(cards_DATA)
+EXTRA_DIST = $(icon_DATA) $(glade_DATA) $(pixmap_DATA)
diff -Naur gnome-hearts-0.2/pixmaps/Makefile.in gnome-hearts-0.2.patched/pixmaps/Makefile.in
--- gnome-hearts-0.2/pixmaps/Makefile.in	2007-09-08 00:10:55.000000000 +0200
+++ gnome-hearts-0.2.patched/pixmaps/Makefile.in	2007-10-16 21:36:42.000000000 +0200
@@ -48,13 +48,12 @@
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(cardsdir)" "$(DESTDIR)$(gladedir)" \
-	"$(DESTDIR)$(icondir)" "$(DESTDIR)$(pixmapdir)"
-cardsDATA_INSTALL = $(INSTALL_DATA)
+am__installdirs = "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(icondir)" \
+	"$(DESTDIR)$(pixmapdir)"
 gladeDATA_INSTALL = $(INSTALL_DATA)
 iconDATA_INSTALL = $(INSTALL_DATA)
 pixmapDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(cards_DATA) $(glade_DATA) $(icon_DATA) $(pixmap_DATA)
+DATA = $(glade_DATA) $(icon_DATA) $(pixmap_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -211,9 +210,7 @@
 
 pixmapdir = $(datadir)/pixmaps/gnome-hearts
 pixmap_DATA = baize.png
-cardsdir = $(datadir)/pixmaps/gnome-hearts/cards
-cards_DATA = dondorf.svg
-EXTRA_DIST = $(icon_DATA) $(glade_DATA) $(pixmap_DATA) $(cards_DATA)
+EXTRA_DIST = $(icon_DATA) $(glade_DATA) $(pixmap_DATA)
 all: all-am
 
 .SUFFIXES:
@@ -246,23 +243,6 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-cardsDATA: $(cards_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(cardsdir)" || $(MKDIR_P) "$(DESTDIR)$(cardsdir)"
-	@list='$(cards_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(cardsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(cardsdir)/$$f'"; \
-	  $(cardsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(cardsdir)/$$f"; \
-	done
-
-uninstall-cardsDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(cards_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(cardsdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(cardsdir)/$$f"; \
-	done
 install-gladeDATA: $(glade_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
@@ -351,7 +331,7 @@
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(cardsdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(pixmapdir)"; do \
+	for dir in "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(pixmapdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -396,8 +376,7 @@
 
 info-am:
 
-install-data-am: install-cardsDATA install-gladeDATA install-iconDATA \
-	install-pixmapDATA
+install-data-am: install-gladeDATA install-iconDATA install-pixmapDATA
 
 install-dvi: install-dvi-am
 
@@ -431,22 +410,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-cardsDATA uninstall-gladeDATA \
-	uninstall-iconDATA uninstall-pixmapDATA
+uninstall-am: uninstall-gladeDATA uninstall-iconDATA \
+	uninstall-pixmapDATA
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-cardsDATA install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-gladeDATA install-html install-html-am \
-	install-iconDATA install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pixmapDATA install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-cardsDATA uninstall-gladeDATA \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-gladeDATA \
+	install-html install-html-am install-iconDATA install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pixmapDATA install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am uninstall-gladeDATA \
 	uninstall-iconDATA uninstall-pixmapDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -Naur gnome-hearts-0.2/src/gnome-hearts.cfg.in gnome-hearts-0.2.patched/src/gnome-hearts.cfg.in
--- gnome-hearts-0.2/src/gnome-hearts.cfg.in	2007-09-08 00:10:41.000000000 +0200
+++ gnome-hearts-0.2.patched/src/gnome-hearts.cfg.in	2007-10-16 21:42:32.000000000 +0200
@@ -26,7 +26,7 @@
 west_ai=PlayerAI_Mike
 
 # The filename of the card style to use. Full path or a filename in the /cards directory
-card_style=dondorf.svg
+card_style=bonded.svg
 
 # The background
 background_image=@CONFIG_DATA_DIR@/pixmaps/gnome-hearts/baize.png
diff -Naur gnome-hearts-0.2/src/ui.c gnome-hearts-0.2.patched/src/ui.c
--- gnome-hearts-0.2/src/ui.c	2007-09-08 00:10:41.000000000 +0200
+++ gnome-hearts-0.2.patched/src/ui.c	2007-10-16 21:46:42.000000000 +0200
@@ -145,30 +145,18 @@
 	else
 		gtk_toggle_button_set_active((GtkToggleButton*) glade_xml_get_widget(ui.xml, "background_stretch"), TRUE);
 	
-	/* Find all the card styles in the gnome-hearts cards directory */
-	DIR *directory = opendir(PACKAGE_DATA_DIR"/pixmaps/gnome-hearts/cards/");
+	/* read cards from the gnome-games card dir */
+	DIR *directory = opendir(PACKAGE_DATA_DIR"/gnome-games-common/cards/");
 	struct dirent *file;
 	
 	g_assert(directory != NULL);
 	while ((file = readdir(directory)))
 	{
 		if (g_str_has_suffix(file->d_name, ".png") || g_str_has_suffix(file->d_name, ".svg"))
-			ui_add_card_style(g_strdup(file->d_name), g_strconcat(PACKAGE_DATA_DIR"/pixmaps/gnome-hearts/cards/", file->d_name, NULL));
+			ui_add_card_style(g_strdup(file->d_name), g_strconcat(PACKAGE_DATA_DIR"/gnome-games-common/cards/", file->d_name, NULL));
 	}
 	closedir(directory);
 	
-	/* read cards from the gnome-games card dir */
-	directory = opendir(PACKAGE_DATA_DIR"/gnome-games-common/cards/");
-	if (directory != NULL)
-	{
-		while ((file = readdir(directory)))
-		{
-			if (g_str_has_suffix(file->d_name, ".png") || g_str_has_suffix(file->d_name, ".svg"))
-				ui_add_card_style(g_strdup(file->d_name), g_strconcat(PACKAGE_DATA_DIR"/gnome-games-common/cards/", file->d_name, NULL));
-		}
-		closedir(directory);
-	}
-	
 	/* Loop over all the card styles that were added, find the one in cfg and activate it */
 	i = 0;
 	for (l = ui.card_styles; l; l = l->next)
gnome-hearts (0.3-2) 01_gnome_cards_data.patch

Summary

Patch contents
