*** RELEASE 8.2BETA1 ***

	- fixed all boards/Makefile.am, the transformation for i18n was not good enough
	  and was breaking the game missing_letter.
	- added support for py2exe on windows which allow us to create an embedded package
	  with python, pygtk and pycairo all together
	- cleanup in boards/* to replace assert by g_assert and remove uneeded includes.
	- fixed awele to run on windows replace font "12x24" by "sans 12"

6 files changed, 120 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index f85930a..9fa3605 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,112 @@
+	*** RELEASE 8.2BETA1 ***
+
+2006-10-22  Bruno coudoin  <bruno.coudoin@free.fr>
+
+	- fixed all boards/Makefile.am, the transformation for i18n was not good enough
+	  and was breaking the game missing_letter.
+	- added support for py2exe on windows which allow us to create an embedded package
+	  with python, pygtk and pycairo all together
+	- cleanup in boards/* to replace assert by g_assert and remove uneeded includes.
+	- fixed awele to run on windows replace font "12x24" by "sans 12"
+
+	* INSTALL:
+	* Makefile.mingw.in:
+	* README.mingw:
+	* boards/Makefile.am:
+	* boards/advanced_colors/Makefile.am:
+	* boards/babymatch/Makefile.am:
+	* boards/babyshapes/Makefile.am:
+	* boards/chronos/Makefile.am:
+	* boards/doubleentry/Makefile.am:
+	* boards/geography/Makefile.am:
+	* boards/imageid/Makefile.am:
+	* boards/imagename/Makefile.am:
+	* boards/missing_letter/Makefile.am:
+	* boards/paintings/Makefile.am:
+	* boards/read_colors/Makefile.am:
+	* boards/scales/Makefile.am:
+	* src/boards/advanced_colors.c: (highlight_selected), (init_xml):
+	* src/boards/algebra_guesscount.c: (token_result),
+	(generate_numbers), (oper_char_to_pixmap_index), (item_event_num):
+	* src/boards/awele.c: (is_our_board), (set_level),
+	(awele_next_level), (awele_create_item), (game_won),
+	(initBoardGraphics), (to_computer), (buttonClick), (updateNbBeans),
+	(updateCapturedBeans):
+	* src/boards/canal_lock.c: (canal_lock_create_item), (move_boat),
+	(update_water), (toggle_lock), (animate_step), (hightlight),
+	(item_event):
+	* src/boards/chess.c:
+	* src/boards/click_on_letter.c: (sounds_are_fine),
+	(click_on_letter_create_item):
+	* src/boards/colors.c: (save_table), (conf_ok),
+	(colors_config_start), (start_board), (repeat),
+	(highlight_selected):
+	* src/boards/crane.c: (start_board), (set_level), (arrow_event),
+	(draw_arrow), (draw_redhands), (shuffle_list), (select_item):
+	* src/boards/enumerate.c: (key_press), (enumerate_next_level),
+	(enumerate_create_item), (item_event_focus), (item_event):
+	* src/boards/erase.c: (erase_create_item):
+	* src/boards/fifteen.c: (fifteen_create_item), (piece_event):
+	* src/boards/gletters.c: (level_set_score), (load_default_charset),
+	(end_board), (unichar_comp), (key_press), (gletters_next_level),
+	(gletters_move_item), (gletters_destroy_items),
+	(gletters_destroy_all_items), (gletters_move_items),
+	(gletters_create_item), (gletters_add_new_item),
+	(item_find_by_title), (save_table), (conf_ok),
+	(gletter_config_start):
+	* src/boards/hanoi.c: (hanoi_next_level),
+	(hanoi_destroy_all_items), (dump_solution), (hanoi_create_item),
+	(item_event):
+	* src/boards/hanoi_real.c: (hanoi_destroy_all_items),
+	(dump_solution), (hanoi_create_item), (item_event):
+	* src/boards/imageid.c: (start_board), (end_board),
+	(imageid_create_item), (item_event), (init_xml), (save_table),
+	(conf_ok), (config_start):
+	* src/boards/leftright.c: (start_board), (item_event):
+	* src/boards/machpuzzle.c: (item_event), (create_machine_item),
+	(rectangle_in), (minigolf_move):
+	* src/boards/maze.c: (start_board), (maze_next_level),
+	(setlevelproperties), (repeat), (draw_image), (draw_combined_rect),
+	(generateMaze), (movePos), (one_step), (key_press),
+	(key_press_2D_relative), (key_press_3D), (is_visible), (dx_left),
+	(wall_coords), (Trapez_hide), (gcDisplay), (Display3),
+	(twoDdisplay), (update_tux):
+	* src/boards/memory.c: (get_random_token), (pause_board),
+	(start_board), (memory_next_level), (memory_destroy_all_items),
+	(get_image), (create_item), (hide_card), (check_win), (item_event),
+	(tux_play):
+	* src/boards/missingletter.c: (start_board),
+	(missing_letter_create_item), (item_event), (init_xml),
+	(add_xml_data), (save_table), (conf_ok), (config_start):
+	* src/boards/money.c: (money_next_level):
+	* src/boards/python.c: (pythonboard_is_our_board):
+	* src/boards/python/anim.py:
+	* src/boards/python/tuxpaint.py:
+	* src/boards/railroad.c: (start_board), (railroad_next_level),
+	(railroad_create_item):
+	* src/boards/read_colors.c: (highlight_selected), (init_xml):
+	* src/boards/reading.c: (display_what_to_do),
+	(reading_create_item):
+	* src/boards/reversecount.c:
+	* src/boards/shapegame.c: (is_our_board):
+	* src/boards/submarine.c: (update_timeout_slow),
+	(submarine_explosion):
+	* src/boards/superbrain.c: (superbrain_next_level),
+	(superbrain_create_item), (item_event), (mark_pieces):
+	* src/boards/target.c: (key_press), (target_create_item),
+	(process_ok), (request_score), (animate_items), (launch_dart),
+	(item_event):
+	* src/boards/traffic.c: (start_board), (car_cb), (cars_from_strv):
+	* src/boards/wordprocessor.c:
+	* src/boards/wordsgame.c: (key_press), (wordsgame_move_items),
+	(wordsgame_destroy_items), (wordsgame_add_new_item), (player_win):
+	* src/gcompris/Makefile.am:
+	* src/gcompris/Makefile.mingw:
+	* src/gcompris/menu.c: (gc_menu_board_free):
+	* tools/py2exe/README:
+	* tools/py2exe/gcompris.py:
+	* tools/py2exe/setup.py:
+
 2006-10-20  Bruno coudoin  <bruno.coudoin@free.fr>
 
 	- Unexistant font on windows in gartoon/skin.xml makes it unstable.
diff --git a/INSTALL b/INSTALL
index 8f01ad0..ab8d657 100644
--- a/INSTALL
+++ b/INSTALL
@@ -26,7 +26,7 @@ GCompris includes several activity written in python.
 To enable them, you need to have python installed on your system with the following packages:
 libpython
 python
-libpython2.2-devel
+libpython2.4-devel
 python-base
 python-sqlite2 (if it's not packaged, download and install it from http://initd.org/tracker/pysqlite)
 
diff --git a/Makefile.mingw.in b/Makefile.mingw.in
index fd0485d..dd748a4 100644
--- a/Makefile.mingw.in
+++ b/Makefile.mingw.in
@@ -18,12 +18,14 @@ LIBXML2_TOP :=		/libxml2
 SDL_TOP :=		/sdl
 CANVAS_TOP :=		/gnomecanvas
 GNUCHESS_TOP :=		/gnuchess
+GNUCAP_TOP :=		/gnucap
 
 MAKENSIS := "/c/Program Files/NSIS/makensis.exe"
 
 # These will be copied in the win32-install-dir ready to be packaged.
 NEEDED_DLLS =		$(GNUCHESS_TOP)/bin/pthreadGC.dll \
 			$(GNUCHESS_TOP)/bin/libreadline.dll \
+			$(GNUCAP_TOP)/src/MSW/gnucap.exe \
 			$(GTK_TOP)/bin/gspawn-win32-helper.exe \
 			$(GNUCHESS_TOP)/bin/gnuchess.exe \
 			$(GNUWIN32_TOP)/bin/popt1.dll \
@@ -101,6 +103,10 @@ prepack:
 	cp -r $(GTK_TOP)/lib/gtk-2.0 $(GCOMPRIS_INSTALL_DIR)/lib
 	cp -r $(GTK_TOP)/lib/pango $(GCOMPRIS_INSTALL_DIR)/lib
 
+python:
+	cp tools/py2exe/gcompris.py $(GCOMPRIS_INSTALL_DIR)
+	cp tools/py2exe/setup.py $(GCOMPRIS_INSTALL_DIR)
+	cd $(GCOMPRIS_INSTALL_DIR);/c/Python24/python.exe setup.py py2exe;cp dist/library.zip python24.zip;cp dist/*.pyd .;rm -rf dist build;rm -f gcompris.py*;cd ..
 
 installer:
 	$(MAKENSIS) gcompris-installer.nsi
@@ -129,4 +135,4 @@ prep:
 	mkdir $(GCOMPRIS_INSTALL_DIR)/share/pixmaps
 	cp gcompris.png $(GCOMPRIS_INSTALL_DIR)/share/pixmaps
 	@echo "Create the file gcompris-win-prepack.tar.gz"
-	tar -czf gcompris-win-prepack.tar.gz win32-install-dir nsis
+	tar -czf gcompris-win-prepack.tar.gz win32-install-dir nsis tools
diff --git a/README.mingw b/README.mingw
index 82fc32d..c96c308 100644
--- a/README.mingw
+++ b/README.mingw
@@ -69,6 +69,7 @@ GNUCHESS_TOP :=		/gnuchess
 * run: make -f Makefile.mingw from gcompris's top-level directory.  This will take a long time.
 * run: make -f Makefile.mingw prepack to include all necessary libraries in the installer directory
 * run: make -f Makefile.mingw install to include the generated code in the installer directory
+* run: make -f Makefile.mingw python to created an embedded python interpreter
 
 the win32-install-dir should contain anything needed to run and package GCompris.
 
diff --git a/boards/Makefile.am b/boards/Makefile.am
index d580dd0..f09f68e 100644
--- a/boards/Makefile.am
+++ b/boards/Makefile.am
@@ -142,6 +142,6 @@ xml_DATA = $(xml_in_files:.xml.in=.xml)
 # runtime.
 #
 $(xml_DATA): %.xml: %.xml.in
-	sed -e "s/\(\<\)\/*_//g" $< > $@
+	sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
 
 CLEANFILES = $(xml_DATA)
diff --git a/configure.in b/configure.in
index 629fa99..ed6f652 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(src/gcompris/gcompris.c)
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(gcompris, 8.2)
+AM_INIT_AUTOMAKE(gcompris, 8.2BETA1)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE