r13171 - in /packages/unstable/gnome-hearts/debian: changelog control control.in patches/01_gnome_cards_data.patch

sander-m-guest at users.alioth.debian.org sander-m-guest at users.alioth.debian.org
Tue Oct 16 20:09:02 UTC 2007 

Author: sander-m-guest
Date: Tue Oct 16 20:09:02 2007
New Revision: 13171

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13171
Log:
* New upstream release. Closes: #425670, #420861.
  - Big rewrite of the C code
  - Uses Python instead of Lua for AI scripts
  - Many bugfixes and translation updates

Modified:
    packages/unstable/gnome-hearts/debian/changelog
    packages/unstable/gnome-hearts/debian/control
    packages/unstable/gnome-hearts/debian/control.in
    packages/unstable/gnome-hearts/debian/patches/01_gnome_cards_data.patch

Modified: packages/unstable/gnome-hearts/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-hearts/debian/changelog?rev=13171&op=diff
==============================================================================
--- packages/unstable/gnome-hearts/debian/changelog (original)
+++ packages/unstable/gnome-hearts/debian/changelog Tue Oct 16 20:09:02 2007
@@ -1,3 +1,12 @@
+gnome-hearts (0.2.0-1) unstable; urgency=low
+
+  * New upstream release. Closes: #425670, #420861.
+    - Big rewrite of the C code
+    - Uses Python instead of Lua for AI scripts
+    - Many bugfixes and translation updates
+
+ -- Sander Marechal <s.marechal at jejik.com>  Tue, 16 Oct 2007 22:07:00 +0200
+
 gnome-hearts (0.1.3-4) unstable; urgency=low
 
   * 01_gnome_cards_data.patch: use the new path for cards.

Modified: packages/unstable/gnome-hearts/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-hearts/debian/control?rev=13171&op=diff
==============================================================================
--- packages/unstable/gnome-hearts/debian/control (original)
+++ packages/unstable/gnome-hearts/debian/control Tue Oct 16 20:09:02 2007
@@ -11,8 +11,7 @@
                gettext,
                gnome-pkg-tools,
                librsvg2-dev (>= 2.7),
-               liblua50-dev,
-               liblualib50-dev,
+               python2.4-dev,
                libxml-parser-perl,
                scrollkeeper (>= 0.3.8)
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>

Modified: packages/unstable/gnome-hearts/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-hearts/debian/control.in?rev=13171&op=diff
==============================================================================
--- packages/unstable/gnome-hearts/debian/control.in (original)
+++ packages/unstable/gnome-hearts/debian/control.in Tue Oct 16 20:09:02 2007
@@ -11,8 +11,7 @@
                gettext,
                gnome-pkg-tools,
                librsvg2-dev (>= 2.7),
-               liblua50-dev,
-               liblualib50-dev,
+               python2.4-dev,
                libxml-parser-perl,
                scrollkeeper (>= 0.3.8)
 Uploaders: @GNOME_TEAM@

Modified: packages/unstable/gnome-hearts/debian/patches/01_gnome_cards_data.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-hearts/debian/patches/01_gnome_cards_data.patch?rev=13171&op=diff
==============================================================================
--- packages/unstable/gnome-hearts/debian/patches/01_gnome_cards_data.patch (original)
+++ packages/unstable/gnome-hearts/debian/patches/01_gnome_cards_data.patch Tue Oct 16 20:09:02 2007
@@ -1,6 +1,6 @@
-diff -Naur gnome-hearts-0.1.3/pixmaps/dondorf.svg gnome-hearts-0.1.3.patched/pixmaps/dondorf.svg
---- gnome-hearts-0.1.3/pixmaps/dondorf.svg	2006-08-03 22:18:01.000000000 +0200
-+++ gnome-hearts-0.1.3.patched/pixmaps/dondorf.svg	1970-01-01 01:00:00.000000000 +0100
+diff -Naur gnome-hearts-0.2/pixmaps/dondorf.svg gnome-hearts-0.2.patched/pixmaps/dondorf.svg
+--- gnome-hearts-0.2/pixmaps/dondorf.svg	2007-09-08 00:10:41.000000000 +0200
++++ gnome-hearts-0.2.patched/pixmaps/dondorf.svg	1970-01-01 01:00:00.000000000 +0100
 @@ -1,4864 +0,0 @@
 -<?xml version="1.0" encoding="utf-8"?>
 -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
@@ -4866,9 +4866,9 @@
 -  <rect x="805.5" y="382.5" width="48" height="96"/>
 - </g>
 -</svg>
-diff -Naur gnome-hearts-0.1.3/pixmaps/Makefile.am gnome-hearts-0.1.3.patched/pixmaps/Makefile.am
---- gnome-hearts-0.1.3/pixmaps/Makefile.am	2006-08-03 22:18:01.000000000 +0200
-+++ gnome-hearts-0.1.3.patched/pixmaps/Makefile.am	2006-12-12 23:58:27.000000000 +0100
+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
@@ -4878,10 +4878,10 @@
 -
 -EXTRA_DIST = $(icon_DATA) $(glade_DATA) $(pixmap_DATA) $(cards_DATA)
 +EXTRA_DIST = $(icon_DATA) $(glade_DATA) $(pixmap_DATA)
-diff -Naur gnome-hearts-0.1.3/pixmaps/Makefile.in gnome-hearts-0.1.3.patched/pixmaps/Makefile.in
---- gnome-hearts-0.1.3/pixmaps/Makefile.in	2006-11-06 21:07:39.000000000 +0100
-+++ gnome-hearts-0.1.3.patched/pixmaps/Makefile.in	2006-12-12 23:58:27.000000000 +0100
-@@ -52,13 +52,12 @@
+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|^.*/||'`;
@@ -4898,7 +4898,7 @@
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
  ALL_LINGUAS = @ALL_LINGUAS@
-@@ -194,9 +193,7 @@
+@@ -211,9 +210,7 @@
  
  pixmapdir = $(datadir)/pixmaps/gnome-hearts
  pixmap_DATA = baize.png
@@ -4909,13 +4909,13 @@
  all: all-am
  
  .SUFFIXES:
-@@ -230,23 +227,6 @@
+@@ -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
- uninstall-info-am:
 -install-cardsDATA: $(cards_DATA)
 -	@$(NORMAL_INSTALL)
--	test -z "$(cardsdir)" || $(mkdir_p) "$(DESTDIR)$(cardsdir)"
+-	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) \
@@ -4932,17 +4932,17 @@
 -	done
  install-gladeDATA: $(glade_DATA)
  	@$(NORMAL_INSTALL)
- 	test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
-@@ -336,7 +316,7 @@
+ 	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"; \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: install-am
-@@ -381,8 +361,7 @@
+@@ -396,8 +376,7 @@
  
  info-am:
  
@@ -4950,43 +4950,46 @@
 -	install-pixmapDATA
 +install-data-am: install-gladeDATA install-iconDATA install-pixmapDATA
  
- install-exec-am:
+ install-dvi: install-dvi-am
  
-@@ -408,19 +387,19 @@
+@@ -431,22 +410,21 @@
  
  ps-am:
  
 -uninstall-am: uninstall-cardsDATA uninstall-gladeDATA \
--	uninstall-iconDATA uninstall-info-am uninstall-pixmapDATA
-+uninstall-am: uninstall-gladeDATA uninstall-iconDATA uninstall-info-am \
+-	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-exec install-exec-am install-gladeDATA \
+-	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-pixmapDATA install-strip installcheck installcheck-am \
+-	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 \
--	uninstall-iconDATA uninstall-info-am uninstall-pixmapDATA
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-gladeDATA install-iconDATA \
-+	install-info install-info-am install-man install-pixmapDATA \
-+	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-info-am \
-+	uninstall-pixmapDATA
++	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.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Naur gnome-hearts-0.1.3/src/gnome-hearts.cfg.in gnome-hearts-0.1.3.patched/src/gnome-hearts.cfg.in
---- gnome-hearts-0.1.3/src/gnome-hearts.cfg.in	2006-08-03 22:18:01.000000000 +0200
-+++ gnome-hearts-0.1.3.patched/src/gnome-hearts.cfg.in	2006-12-12 23:58:27.000000000 +0100
+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=Mike
+ 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
@@ -4994,37 +4997,25 @@
  
  # The background
  background_image=@CONFIG_DATA_DIR@/pixmaps/gnome-hearts/baize.png
-diff -Naur gnome-hearts-0.1.3/src/hearts.c gnome-hearts-0.1.3.patched/src/hearts.c
---- gnome-hearts-0.1.3/src/hearts.c	2006-11-06 20:54:50.000000000 +0100
-+++ gnome-hearts-0.1.3.patched/src/hearts.c	2006-12-12 23:59:39.000000000 +0100
-@@ -658,7 +658,7 @@
- 	game_rules.north_ai = g_string_new("John");
- 	game_rules.east_ai  = g_string_new("John");
- 	game_rules.west_ai  = g_string_new("John");
--	game_card_style = g_string_new("dondorf.svg");
-+	game_card_style = g_string_new("bonded.svg");
- 	game_background = g_string_new(PACKAGE_DATA_DIR"/pixmaps/gnome-hearts/baize.png");
- 	game_background_tiled = TRUE;
- }
-@@ -847,33 +847,21 @@
- /* build the lists of card styles */
- void load_card_styles()
- {
+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/");
-+	DIR *directory = opendir(PACKAGE_DATA_DIR"/gnome-games-common/cards/");
++	/* read cards from the gnome-games card dir */
++	DIR *directory = opendir(PACKAGE_DATA_DIR"/pixmaps/gnome-games-common/cards/");
  	struct dirent *file;
- 	GString *first_style = NULL;
- 
- 	game_card_styles = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
- 
--	/* read cards from the hearts card dir */
-+	/* read cards from the gnome-games card dir */
+ 	
  	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"))
--			g_hash_table_insert(game_card_styles, g_strdup(file->d_name), g_strconcat(PACKAGE_DATA_DIR"/pixmaps/gnome-hearts/cards/", file->d_name, NULL));
-+			g_hash_table_insert(game_card_styles, g_strdup(file->d_name), g_strconcat(PACKAGE_DATA_DIR"/gnome-games-common/cards/", file->d_name, NULL));
+-			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"/pixmaps/gnome-games-common/cards/", file->d_name, NULL));
  	}
  	closedir(directory);
  	
@@ -5035,11 +5026,11 @@
 -		while ((file = readdir(directory)))
 -		{
 -			if (g_str_has_suffix(file->d_name, ".png") || g_str_has_suffix(file->d_name, ".svg"))
--				g_hash_table_insert(game_card_styles, g_strdup(file->d_name), g_strconcat(PACKAGE_DATA_DIR"/pixmaps/gnome-games-common/cards/", file->d_name, NULL));
+-				ui_add_card_style(g_strdup(file->d_name), g_strconcat(PACKAGE_DATA_DIR"/pixmaps/gnome-games-common/cards/", file->d_name, NULL));
 -		}
 -		closedir(directory);
 -	}
 -	
- 	/* loop over he hash table, add all card styles to the combo box and set the active one */
- 	g_hash_table_foreach(game_card_styles, (GHFunc)card_style_add, &first_style);
- 	
+ 	/* 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)

More information about the pkg-gnome-commits mailing list