fixes for gcompris 2.1R_2_1

3 files changed, 23 insertions, 62 deletions

diff --git a/boards/Makefile.am b/boards/Makefile.am
index 185915d..5f9121e 100644
--- a/boards/Makefile.am
+++ b/boards/Makefile.am
@@ -27,7 +27,6 @@ xml_in_files = \
 	geography.xml.in \
 	gletters.xml.in \
 	imagename.xml.in \
-	machpuzzle.xml.in \
 	maze.xml.in \
 	maze3D.xml.in \
 	memory.xml.in \
diff --git a/gcompris.spec.in b/gcompris.spec.in
index 6137274..4fbea6a 100644
--- a/gcompris.spec.in
+++ b/gcompris.spec.in
@@ -55,56 +55,13 @@ Le jeu est inclus dans le bureau Gnome sous le menu Jeux.
 À installer si vous avez des enfants utilisant cet ordinateur.
 
 %changelog
-* Thu Dec 27 2001  Christian Rose  <menthos@menthos.com>
-- gcompris.spec.in: Added fix for the different namings of
--                   the gnomecanvas packages on Mandrake
--                   and Red Hat systems. Also removed references
--                   to dependencies in the descriptions.
-* Sun Sep 30 2001  Bruno Coudoin  <bruno.coudoin@free.fr>
-- GCompris: Release 0.7.5
-- TRANSLATION IS FIXED
-
-* Fri May 25 2001  Bruno Coudoin  <bruno.coudoin@free.fr>
-- TRANSLATION IS BROKEN
-- WARNING: THE HIGHLIGHTING IS BROKEN
-- ALL: Replace the imlib for images by the gdk-pixbuf library
-- gcompris.spec.in: Added back the gcompris icon pixmap
-- clickgame.c: Limit the number of fish to 5
-- clickgame.c: Simplified the code by removing one hashtable.
-- shapegame.c: Changed the board order to have the most difficult
-               at the higher level (as suggested by Yann Dirson)
-	       Added the method shuffle_shape_list()
-- gcompris.c (end_game): reset the timer in the status bar
-- Makefile.am: Added DESTDIR prefix in the install hooks
-- ALL: Boards are now separated from gcompris in src/
-- boards/*: All boards are defined as independant plugins
-- gcompris/*: Added the necessary glue to load the plugins
-- configure.in: Removed PACKAGE_PIXMAPS_DIR
-- data/*: The data directory has been renamed in boards
-- pixmaps/*: The pixmaps directory has been moved to board/gcompris
-             This will be the default gcompris icons. Other icons
-             have been moved in a dir specific to their boards.
-- boards/planegame.c: Set a max speed for the plane because children
-		      have difficulties to manipulate it.
-- docs/C/gcompris.texi: Update of the doc to explain the new plugin
-                        mecanism
-
-* Wed Apr 11 2001  Bruno Coudoin  <bruno.coudoin@free.fr>
-- GCompris: Release 0.4.2
-- gcompris.c: adjusted main window size calculation.
-              it fixes a bug was making gcompris hardly
-	      unusable under 640x400
-	      Changed to not use the Gnome standard menu for loading
-	      help. Implemented my own to be able to be relocatable.
-	      This hack does not implement I18N for the help file.
-- fi.po: Created by Jyrki Kuoppala <jkp@kaapeli.fi>
-- data/wordsgame/*.fi:Created by Jyrki Kuoppala <jkp@kaapeli.fi>
-- gcompris.soundlist: deleted. I now use direct sound call instead
-	                      of gnome .soundlist API
-- sounds/*: now sounds are local to gcompris.
-- configure.in: Changed to use local relative pixmaps and sounds
-	                instead of gnome api
-- src/*.c: Changed to use relative pixmaps and sounds
+* Thu Feb 06 2003  Bruno Coudoin <bruno.coudoin@free.fr>
+- Added the money board
+- Added the traffic board
+- Added more translation
+- Better graphics
+- Code cleanup and bugfixes
+- Added portuguese speech
 
 %package sounds-fr
 Summary:        French sounds for GCompris
@@ -138,6 +95,14 @@ Requires:       %name
 %description sounds-en
 English sounds for gcompris.
 
+%package sounds-pt
+Summary:        Portuguese sounds for GCompris
+Group: 		Amusements/Games
+Requires:       %name
+
+%description sounds-pt
+Portuguese sounds for gcompris.
+
 %prep
 %setup -q
 
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 8f116b1..ee22e42 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -26,10 +26,11 @@ VPATH = @srcdir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
-localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = $(prefix)/share/glib-2.0/gettext/po
+datadir = @datadir@
+libdir = @libdir@
+localedir = $(libdir)/locale
+gnulocaledir = $(datadir)/locale
+gettextsrcdir = $(datadir)/glib-2.0/gettext/po
 subdir = po
 
 INSTALL = @INSTALL@
@@ -38,13 +39,10 @@ MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
 
 CC = @CC@
 GENCAT = @GENCAT@
-GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
+GMSGFMT = @GMSGFMT@
 MSGFMT = @MSGFMT@
-XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+XGETTEXT = @XGETTEXT@
+MSGMERGE = msgmerge
 
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
@@ -197,7 +195,6 @@ dist distdir: update-po $(DISTFILES)
 
 update-po: Makefile
 	$(MAKE) $(GETTEXT_PACKAGE).pot
-	PATH=`pwd`/../src:$$PATH; \
 	cd $(srcdir); \
 	catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \