5 files changed, 336 insertions, 281 deletions

diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index a0081adf9d02..b65387970930 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gcompris
-PORTVERSION=	0.5.1
+PORTVERSION=	0.6.1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	${LOCALBASE}/share/automake/install-sh:${PORTSDIR}/devel/automake
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/games/gcompris/distinfo b/games/gcompris/distinfo
index 743736195dea..e9b1daefd733 100644
--- a/games/gcompris/distinfo
+++ b/games/gcompris/distinfo
@@ -1 +1 @@
-MD5 (gcompris-0.5.1.tgz) = bafba9c4d5521c8344a51f5bd6c44922
+MD5 (gcompris-0.6.1.tgz) = bec5e0c0928e6208065cfa2c6cdbfc45
diff --git a/games/gcompris/files/patch-ac b/games/gcompris/files/patch-ac
index 3a2a9986299b..8e75eb26b92c 100644
--- a/games/gcompris/files/patch-ac
+++ b/games/gcompris/files/patch-ac
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Tue Apr 17 11:15:52 2001
-+++ Makefile.in	Tue Apr 17 11:35:09 2001
-@@ -173,9 +173,9 @@
+--- Makefile.in.orig	Mon May 28 13:18:45 2001
++++ Makefile.in	Mon May 28 13:33:59 2001
+@@ -183,9 +183,9 @@
  		rm -f $(srcdir)/stamp-h.in; \
  		$(MAKE) $(srcdir)/stamp-h.in; \
  	else :; fi
@@ -16,30 +16,29 @@ $FreeBSD$
  
  mostlyclean-hdr:
  
-@@ -456,22 +456,22 @@
+@@ -417,7 +417,7 @@
+ install-exec-am:
+ install-exec: install-exec-recursive
+ 
+-install-data-am: install-GamesDATA install-MenuDATA install-iconDATA \
++install-data-am: install-GamesDATA install-iconDATA \
+ 		install-data-local
+ install-data: install-data-recursive
+ 
+@@ -488,14 +488,14 @@
  	@$(NORMAL_INSTALL)
- 	if test -d pixmaps; then \
- 	  $(mkinstalldirs) $(pixmapdir); \
--	  cd pixmaps ; tar cf -  --exclude CVS --exclude .xvpics * | ( cd $(pixmapdir) ; tar xf -) ; cd .. ; \
-+	  cd pixmaps ; tar --exclude CVS --exclude .xvpics -cf - * | ( cd $(pixmapdir) ; tar xf -) ; cd .. ; \
- 	fi
- 	if test -d data; then \
- 	  $(mkinstalldirs) $(leveldatadir); \
--	  cd data ; tar cf -  --exclude CVS --exclude .xvpics * | ( cd $(leveldatadir) ; tar xf -) ; cd .. ; \
-+	  cd data ; tar --exclude CVS --exclude .xvpics -cf - * | ( cd $(leveldatadir) ; tar xf -) ; cd .. ; \
+ 	if test -d @PACKAGE_DATA_DIR@; then \
+ 	  $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@; \
+-	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
++	  cd @PACKAGE_DATA_DIR@ ; tar --exclude CVS --exclude .xvpics -cf - * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
  	fi
  
  dist-hook:
  	cp gcompris.spec $(distdir)
- 	if test -d pixmaps; then \
- 	  $(mkinstalldirs) $(distdir)/pixmaps; \
--	  cd pixmaps ; tar cf -  --exclude CVS --exclude .xvpics * | ( cd ../$(distdir)/pixmaps ; tar xf -) ; cd .. ; \
-+	  cd pixmaps ; tar --exclude CVS --exclude .xvpics -cf - * | ( cd ../$(distdir)/pixmaps ; tar xf -) ; cd .. ; \
- 	fi
- 	if test -d data; then \
- 	  $(mkinstalldirs) $(distdir)/data; \
--	  cd data ; tar cf -  --exclude CVS --exclude .xvpics * | ( cd ../$(distdir)/data ; tar xf -) ; cd .. ; \
-+	  cd data ; tar --exclude CVS --exclude .xvpics -cf - * | ( cd ../$(distdir)/data ; tar xf -) ; cd .. ; \
+ 	if test -d @PACKAGE_DATA_DIR@; then \
+ 	  $(mkinstalldirs) $(distdir)/@PACKAGE_DATA_DIR@; \
+-	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
++	  cd @PACKAGE_DATA_DIR@ ; tar --exclude CVS --exclude .xvpics -cf - * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
  	fi
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/games/gcompris/files/patch-configure b/games/gcompris/files/patch-configure
index 60de4a21276d..4dc527f10096 100644
--- a/games/gcompris/files/patch-configure
+++ b/games/gcompris/files/patch-configure
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Apr 17 11:15:52 2001
-+++ configure	Tue Apr 17 11:16:39 2001
-@@ -4463,21 +4463,21 @@
+--- configure.orig	Mon May 28 13:15:07 2001
++++ configure	Mon May 28 13:17:17 2001
+@@ -5147,14 +5147,14 @@
  PACKAGE_SOUNDS_DIR="sounds"
  
  cat >> confdefs.h <<EOF
@@ -12,19 +12,11 @@ $FreeBSD$
  EOF
  
  
- PACKAGE_DATA_DIR="data"
+ PACKAGE_DATA_DIR="boards"
  
  cat >> confdefs.h <<EOF
--#define PACKAGE_DATA_DIR "${myprefix}/${DATADIRNAME}/${PACKAGE}/data"
-+#define PACKAGE_DATA_DIR "${myprefix}/${DATADIRNAME}/gnome/${PACKAGE}/data"
- EOF
- 
- 
- PACKAGE_PIXMAPS_DIR="pixmaps"
- 
- cat >> confdefs.h <<EOF
--#define PACKAGE_PIXMAPS_DIR "${myprefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
-+#define PACKAGE_PIXMAPS_DIR "${myprefix}/${DATADIRNAME}/gnome/${PACKAGE}/pixmaps"
+-#define PACKAGE_DATA_DIR "${myprefix}/${DATADIRNAME}/${PACKAGE}/boards"
++#define PACKAGE_DATA_DIR "${myprefix}/${DATADIRNAME}/gnome/${PACKAGE}/boards"
  EOF
  
  
diff --git a/games/gcompris/pkg-plist b/games/gcompris/pkg-plist
index e97fb4d119de..825b5d826c31 100644
--- a/games/gcompris/pkg-plist
+++ b/games/gcompris/pkg-plist
@@ -1,236 +1,299 @@
 bin/gcompris
 info/gcompris.info
+lib/gcompris/libalgebra.la
+lib/gcompris/libalgebra.so
+lib/gcompris/libclickgame.la
+lib/gcompris/libclickgame.so
+lib/gcompris/libclockgame.la
+lib/gcompris/libclockgame.so
+lib/gcompris/libgletters.la
+lib/gcompris/libgletters.so
+lib/gcompris/libmenu.la
+lib/gcompris/libmenu.so
+lib/gcompris/libplanegame.la
+lib/gcompris/libplanegame.so
+lib/gcompris/libshapegame.la
+lib/gcompris/libshapegame.so
+lib/gcompris/libsmallnumbers.la
+lib/gcompris/libsmallnumbers.so
+lib/gcompris/libwordsgame.la
+lib/gcompris/libwordsgame.so
 share/gnome/apps/Games/gcompris.desktop
-share/gnome/gcompris/data/shapesgame/board1_0.xml
-share/gnome/gcompris/data/shapesgame/board2_0.xml
-share/gnome/gcompris/data/shapesgame/board3_0.xml
-share/gnome/gcompris/data/shapesgame/board4_0.xml
-share/gnome/gcompris/data/shapesgame/board5_0.xml
-share/gnome/gcompris/data/shapesgame/board6_0.xml
-share/gnome/gcompris/data/wordsgame/wordslevel1.de
-share/gnome/gcompris/data/wordsgame/wordslevel1.en
-share/gnome/gcompris/data/wordsgame/wordslevel1.es
-share/gnome/gcompris/data/wordsgame/wordslevel1.fi
-share/gnome/gcompris/data/wordsgame/wordslevel1.fr
-share/gnome/gcompris/data/wordsgame/wordslevel1.it
-share/gnome/gcompris/data/wordsgame/wordslevel1.pt_BR
-share/gnome/gcompris/data/wordsgame/wordslevel2.de
-share/gnome/gcompris/data/wordsgame/wordslevel2.en
-share/gnome/gcompris/data/wordsgame/wordslevel2.es
-share/gnome/gcompris/data/wordsgame/wordslevel2.fi
-share/gnome/gcompris/data/wordsgame/wordslevel2.fr
-share/gnome/gcompris/data/wordsgame/wordslevel2.it
-share/gnome/gcompris/data/wordsgame/wordslevel2.pt_BR
-share/gnome/gcompris/data/wordsgame/wordslevelmax.de
-share/gnome/gcompris/data/wordsgame/wordslevelmax.en
-share/gnome/gcompris/data/wordsgame/wordslevelmax.es
-share/gnome/gcompris/data/wordsgame/wordslevelmax.fi
-share/gnome/gcompris/data/wordsgame/wordslevelmax.fr
-share/gnome/gcompris/data/wordsgame/wordslevelmax.it
-share/gnome/gcompris/data/wordsgame/wordslevelmax.nl
-share/gnome/gcompris/data/wordsgame/wordslevelmax.pt_BR
-share/gnome/gcompris/pixmaps/animals/QueenAngel_0.png
-share/gnome/gcompris/pixmaps/animals/QueenAngel_1.png
-share/gnome/gcompris/pixmaps/animals/blueking2_0.png
-share/gnome/gcompris/pixmaps/animals/blueking2_1.png
-share/gnome/gcompris/pixmaps/animals/butfish_0.png
-share/gnome/gcompris/pixmaps/animals/butfish_1.png
-share/gnome/gcompris/pixmaps/animals/cichlid1_0.png
-share/gnome/gcompris/pixmaps/animals/cichlid1_1.png
-share/gnome/gcompris/pixmaps/animals/cichlid4_0.png
-share/gnome/gcompris/pixmaps/animals/cichlid4_1.png
-share/gnome/gcompris/pixmaps/animals/collaris_0.png
-share/gnome/gcompris/pixmaps/animals/collaris_1.png
-share/gnome/gcompris/pixmaps/animals/discus2_0.png
-share/gnome/gcompris/pixmaps/animals/discus2_1.png
-share/gnome/gcompris/pixmaps/animals/discus3_0.png
-share/gnome/gcompris/pixmaps/animals/discus3_1.png
-share/gnome/gcompris/pixmaps/animals/eel_0.png
-share/gnome/gcompris/pixmaps/animals/eel_1.png
-share/gnome/gcompris/pixmaps/animals/f00_0.png
-share/gnome/gcompris/pixmaps/animals/f00_1.png
-share/gnome/gcompris/pixmaps/animals/f01_0.png
-share/gnome/gcompris/pixmaps/animals/f01_1.png
-share/gnome/gcompris/pixmaps/animals/f02_0.png
-share/gnome/gcompris/pixmaps/animals/f02_1.png
-share/gnome/gcompris/pixmaps/animals/f03_0.png
-share/gnome/gcompris/pixmaps/animals/f03_1.png
-share/gnome/gcompris/pixmaps/animals/f04_0.png
-share/gnome/gcompris/pixmaps/animals/f04_1.png
-share/gnome/gcompris/pixmaps/animals/f05_0.png
-share/gnome/gcompris/pixmaps/animals/f05_1.png
-share/gnome/gcompris/pixmaps/animals/f06_0.png
-share/gnome/gcompris/pixmaps/animals/f06_1.png
-share/gnome/gcompris/pixmaps/animals/f07_0.png
-share/gnome/gcompris/pixmaps/animals/f07_1.png
-share/gnome/gcompris/pixmaps/animals/f08_0.png
-share/gnome/gcompris/pixmaps/animals/f08_1.png
-share/gnome/gcompris/pixmaps/animals/f09_0.png
-share/gnome/gcompris/pixmaps/animals/f09_1.png
-share/gnome/gcompris/pixmaps/animals/f10_0.png
-share/gnome/gcompris/pixmaps/animals/f10_1.png
-share/gnome/gcompris/pixmaps/animals/f11_0.png
-share/gnome/gcompris/pixmaps/animals/f11_1.png
-share/gnome/gcompris/pixmaps/animals/f12_0.png
-share/gnome/gcompris/pixmaps/animals/f12_1.png
-share/gnome/gcompris/pixmaps/animals/f13_0.png
-share/gnome/gcompris/pixmaps/animals/f13_1.png
-share/gnome/gcompris/pixmaps/animals/manta_0.png
-share/gnome/gcompris/pixmaps/animals/manta_1.png
-share/gnome/gcompris/pixmaps/animals/newf1_0.png
-share/gnome/gcompris/pixmaps/animals/newf1_1.png
-share/gnome/gcompris/pixmaps/animals/shark1_0.png
-share/gnome/gcompris/pixmaps/animals/shark1_1.png
-share/gnome/gcompris/pixmaps/animals/six_barred_0.png
-share/gnome/gcompris/pixmaps/animals/six_barred_1.png
-share/gnome/gcompris/pixmaps/animals/teeth_0.png
-share/gnome/gcompris/pixmaps/animals/teeth_1.png
-share/gnome/gcompris/pixmaps/animals/teeth_2.png
-share/gnome/gcompris/pixmaps/animals/teeth_3.png
-share/gnome/gcompris/pixmaps/animals/teeth_4.png
-share/gnome/gcompris/pixmaps/animals/teeth_5.png
-share/gnome/gcompris/pixmaps/animals/teeth_6.png
-share/gnome/gcompris/pixmaps/animals/teeth_7.png
-share/gnome/gcompris/pixmaps/buttons/bad.png
-share/gnome/gcompris/pixmaps/buttons/bar_bg.jpg
-share/gnome/gcompris/pixmaps/buttons/button.png
-share/gnome/gcompris/pixmaps/buttons/home.png
-share/gnome/gcompris/pixmaps/buttons/horver.png
-share/gnome/gcompris/pixmaps/buttons/ok.png
-share/gnome/gcompris/pixmaps/dice/gnome-dice1.png
-share/gnome/gcompris/pixmaps/dice/gnome-dice2.png
-share/gnome/gcompris/pixmaps/dice/gnome-dice3.png
-share/gnome/gcompris/pixmaps/dice/gnome-dice4.png
-share/gnome/gcompris/pixmaps/dice/gnome-dice5.png
-share/gnome/gcompris/pixmaps/dice/gnome-dice6.png
-share/gnome/gcompris/pixmaps/gameicons/algebragame.png
-share/gnome/gcompris/pixmaps/gameicons/clickgame.png
-share/gnome/gcompris/pixmaps/gameicons/clockgame.png
-share/gnome/gcompris/pixmaps/gameicons/gletters.png
-share/gnome/gcompris/pixmaps/gameicons/matritsa.png
-share/gnome/gcompris/pixmaps/gameicons/planegame.png
-share/gnome/gcompris/pixmaps/gameicons/shapegame.png
-share/gnome/gcompris/pixmaps/gameicons/smallnumbers.png
-share/gnome/gcompris/pixmaps/gameicons/wordsgame.png
-share/gnome/gcompris/pixmaps/gcompris-about.jpg
-share/gnome/gcompris/pixmaps/gcompris-bg.jpg
-share/gnome/gcompris/pixmaps/gcompris-init.jpg
-share/gnome/gcompris/pixmaps/letters/*.png
-share/gnome/gcompris/pixmaps/letters/+.png
-share/gnome/gcompris/pixmaps/letters/-.png
-share/gnome/gcompris/pixmaps/letters/0.png
-share/gnome/gcompris/pixmaps/letters/1.png
-share/gnome/gcompris/pixmaps/letters/2.png
-share/gnome/gcompris/pixmaps/letters/3.png
-share/gnome/gcompris/pixmaps/letters/4.png
-share/gnome/gcompris/pixmaps/letters/5.png
-share/gnome/gcompris/pixmaps/letters/6.png
-share/gnome/gcompris/pixmaps/letters/7.png
-share/gnome/gcompris/pixmaps/letters/8.png
-share/gnome/gcompris/pixmaps/letters/9.png
-share/gnome/gcompris/pixmaps/letters/:.png
-share/gnome/gcompris/pixmaps/letters/=.png
-share/gnome/gcompris/pixmaps/letters/?.png
-share/gnome/gcompris/pixmaps/letters/A.png
-share/gnome/gcompris/pixmaps/letters/B.png
-share/gnome/gcompris/pixmaps/letters/C.png
-share/gnome/gcompris/pixmaps/letters/D.png
-share/gnome/gcompris/pixmaps/letters/E.png
-share/gnome/gcompris/pixmaps/letters/F.png
-share/gnome/gcompris/pixmaps/letters/G.png
-share/gnome/gcompris/pixmaps/letters/H.png
-share/gnome/gcompris/pixmaps/letters/I.png
-share/gnome/gcompris/pixmaps/letters/J.png
-share/gnome/gcompris/pixmaps/letters/K.png
-share/gnome/gcompris/pixmaps/letters/L.png
-share/gnome/gcompris/pixmaps/letters/M.png
-share/gnome/gcompris/pixmaps/letters/N.png
-share/gnome/gcompris/pixmaps/letters/O.png
-share/gnome/gcompris/pixmaps/letters/P.png
-share/gnome/gcompris/pixmaps/letters/Q.png
-share/gnome/gcompris/pixmaps/letters/R.png
-share/gnome/gcompris/pixmaps/letters/S.png
-share/gnome/gcompris/pixmaps/letters/T.png
-share/gnome/gcompris/pixmaps/letters/U.png
-share/gnome/gcompris/pixmaps/letters/V.png
-share/gnome/gcompris/pixmaps/letters/W.png
-share/gnome/gcompris/pixmaps/letters/X.png
-share/gnome/gcompris/pixmaps/letters/Y.png
-share/gnome/gcompris/pixmaps/letters/Z.png
-share/gnome/gcompris/pixmaps/letters/a.png
-share/gnome/gcompris/pixmaps/letters/b.png
-share/gnome/gcompris/pixmaps/letters/c.png
-share/gnome/gcompris/pixmaps/letters/d.png
-share/gnome/gcompris/pixmaps/letters/e.png
-share/gnome/gcompris/pixmaps/letters/f.png
-share/gnome/gcompris/pixmaps/letters/g.png
-share/gnome/gcompris/pixmaps/letters/h.png
-share/gnome/gcompris/pixmaps/letters/i.png
-share/gnome/gcompris/pixmaps/letters/j.png
-share/gnome/gcompris/pixmaps/letters/k.png
-share/gnome/gcompris/pixmaps/letters/l.png
-share/gnome/gcompris/pixmaps/letters/m.png
-share/gnome/gcompris/pixmaps/letters/n.png
-share/gnome/gcompris/pixmaps/letters/o.png
-share/gnome/gcompris/pixmaps/letters/p.png
-share/gnome/gcompris/pixmaps/letters/q.png
-share/gnome/gcompris/pixmaps/letters/r.png
-share/gnome/gcompris/pixmaps/letters/s.png
-share/gnome/gcompris/pixmaps/letters/t.png
-share/gnome/gcompris/pixmaps/letters/u.png
-share/gnome/gcompris/pixmaps/letters/v.png
-share/gnome/gcompris/pixmaps/letters/w.png
-share/gnome/gcompris/pixmaps/letters/x.png
-share/gnome/gcompris/pixmaps/letters/y.png
-share/gnome/gcompris/pixmaps/letters/z.png
-share/gnome/gcompris/pixmaps/memory/backcard.png
-share/gnome/gcompris/pixmaps/planegame/THANKS
-share/gnome/gcompris/pixmaps/planegame/cloud.png
-share/gnome/gcompris/pixmaps/planegame/plane.png
-share/gnome/gcompris/pixmaps/shapes/level1/bazille_rampart_1.jpg
-share/gnome/gcompris/pixmaps/shapes/level1/bazille_rampart_2.jpg
-share/gnome/gcompris/pixmaps/shapes/level1/bazille_rampart_3.jpg
-share/gnome/gcompris/pixmaps/shapes/level1/bazille_rampart_4.jpg
-share/gnome/gcompris/pixmaps/shapes/level1/bazille_rampart_5.jpg
-share/gnome/gcompris/pixmaps/shapes/level1/bazille_rampart_6.jpg
-share/gnome/gcompris/pixmaps/shapes/level2/cassat_summertime_1.jpg
-share/gnome/gcompris/pixmaps/shapes/level2/cassat_summertime_2.jpg
-share/gnome/gcompris/pixmaps/shapes/level2/cassat_summertime_3.jpg
-share/gnome/gcompris/pixmaps/shapes/level2/cassat_summertime_4.jpg
-share/gnome/gcompris/pixmaps/shapes/level2/cassat_summertime_5.jpg
-share/gnome/gcompris/pixmaps/shapes/level2/cassat_summertime_6.jpg
-share/gnome/gcompris/pixmaps/shapes/level3/gogh_auvert_1.jpg
-share/gnome/gcompris/pixmaps/shapes/level3/gogh_auvert_2.jpg
-share/gnome/gcompris/pixmaps/shapes/level3/gogh_auvert_3.jpg
-share/gnome/gcompris/pixmaps/shapes/level3/gogh_auvert_4.jpg
-share/gnome/gcompris/pixmaps/shapes/level3/gogh_auvert_5.jpg
-share/gnome/gcompris/pixmaps/shapes/level3/gogh_auvert_6.jpg
-share/gnome/gcompris/pixmaps/shapes/level4/degas_class-dance_1.png
-share/gnome/gcompris/pixmaps/shapes/level4/degas_class-dance_2.png
-share/gnome/gcompris/pixmaps/shapes/level4/degas_class-dance_3.png
-share/gnome/gcompris/pixmaps/shapes/level4/degas_class-dance_4.png
-share/gnome/gcompris/pixmaps/shapes/level4/degas_class-dance_5.png
-share/gnome/gcompris/pixmaps/shapes/level4/degas_class-dance_6.png
-share/gnome/gcompris/pixmaps/shapes/level5/renoir
-share/gnome/gcompris/pixmaps/shapes/level5/renoir-moulin_de_la_galette-1.png
-share/gnome/gcompris/pixmaps/shapes/level5/renoir-moulin_de_la_galette-2.png
-share/gnome/gcompris/pixmaps/shapes/level5/renoir-moulin_de_la_galette-3.png
-share/gnome/gcompris/pixmaps/shapes/level5/renoir-moulin_de_la_galette-4.png
-share/gnome/gcompris/pixmaps/shapes/level5/renoir-moulin_de_la_galette-5.png
-share/gnome/gcompris/pixmaps/shapes/level5/renoir-moulin_de_la_galette-6.png
-share/gnome/gcompris/pixmaps/shapes/level6/renoir-filles_piano-1.png
-share/gnome/gcompris/pixmaps/shapes/level6/renoir-filles_piano-2.png
-share/gnome/gcompris/pixmaps/shapes/level6/renoir-filles_piano-3.png
-share/gnome/gcompris/pixmaps/shapes/level6/renoir-filles_piano-4.png
-share/gnome/gcompris/pixmaps/shapes/level6/renoir-filles_piano-5.png
-share/gnome/gcompris/pixmaps/shapes/level6/renoir-filles_piano-6.png
+share/gnome/gcompris/boards/README
+share/gnome/gcompris/boards/algebra.xml
+share/gnome/gcompris/boards/boardicons/algebra.png
+share/gnome/gcompris/boards/boardicons/clickgame.png
+share/gnome/gcompris/boards/boardicons/clockgame.png
+share/gnome/gcompris/boards/boardicons/computer.png
+share/gnome/gcompris/boards/boardicons/gletters.png
+share/gnome/gcompris/boards/boardicons/matritsa.png
+share/gnome/gcompris/boards/boardicons/planegame.png
+share/gnome/gcompris/boards/boardicons/scalesicon.png
+share/gnome/gcompris/boards/boardicons/shapegame.png
+share/gnome/gcompris/boards/boardicons/smallnumbers.png
+share/gnome/gcompris/boards/boardicons/wordsgame.png
+share/gnome/gcompris/boards/clickgame.xml
+share/gnome/gcompris/boards/clockgame.xml
+share/gnome/gcompris/boards/computer.xml
+share/gnome/gcompris/boards/fishes/QueenAngel_0.png
+share/gnome/gcompris/boards/fishes/QueenAngel_1.png
+share/gnome/gcompris/boards/fishes/blueking2_0.png
+share/gnome/gcompris/boards/fishes/blueking2_1.png
+share/gnome/gcompris/boards/fishes/butfish_0.png
+share/gnome/gcompris/boards/fishes/butfish_1.png
+share/gnome/gcompris/boards/fishes/cichlid1_0.png
+share/gnome/gcompris/boards/fishes/cichlid1_1.png
+share/gnome/gcompris/boards/fishes/cichlid4_0.png
+share/gnome/gcompris/boards/fishes/cichlid4_1.png
+share/gnome/gcompris/boards/fishes/collaris_0.png
+share/gnome/gcompris/boards/fishes/collaris_1.png
+share/gnome/gcompris/boards/fishes/discus2_0.png
+share/gnome/gcompris/boards/fishes/discus2_1.png
+share/gnome/gcompris/boards/fishes/discus3_0.png
+share/gnome/gcompris/boards/fishes/discus3_1.png
+share/gnome/gcompris/boards/fishes/eel_0.png
+share/gnome/gcompris/boards/fishes/eel_1.png
+share/gnome/gcompris/boards/fishes/f00_0.png
+share/gnome/gcompris/boards/fishes/f00_1.png
+share/gnome/gcompris/boards/fishes/f01_0.png
+share/gnome/gcompris/boards/fishes/f01_1.png
+share/gnome/gcompris/boards/fishes/f02_0.png
+share/gnome/gcompris/boards/fishes/f02_1.png
+share/gnome/gcompris/boards/fishes/f03_0.png
+share/gnome/gcompris/boards/fishes/f03_1.png
+share/gnome/gcompris/boards/fishes/f04_0.png
+share/gnome/gcompris/boards/fishes/f04_1.png
+share/gnome/gcompris/boards/fishes/f05_0.png
+share/gnome/gcompris/boards/fishes/f05_1.png
+share/gnome/gcompris/boards/fishes/f06_0.png
+share/gnome/gcompris/boards/fishes/f06_1.png
+share/gnome/gcompris/boards/fishes/f07_0.png
+share/gnome/gcompris/boards/fishes/f07_1.png
+share/gnome/gcompris/boards/fishes/f08_0.png
+share/gnome/gcompris/boards/fishes/f08_1.png
+share/gnome/gcompris/boards/fishes/f09_0.png
+share/gnome/gcompris/boards/fishes/f09_1.png
+share/gnome/gcompris/boards/fishes/f10_0.png
+share/gnome/gcompris/boards/fishes/f10_1.png
+share/gnome/gcompris/boards/fishes/f11_0.png
+share/gnome/gcompris/boards/fishes/f11_1.png
+share/gnome/gcompris/boards/fishes/f12_0.png
+share/gnome/gcompris/boards/fishes/f12_1.png
+share/gnome/gcompris/boards/fishes/f13_0.png
+share/gnome/gcompris/boards/fishes/f13_1.png
+share/gnome/gcompris/boards/fishes/manta_0.png
+share/gnome/gcompris/boards/fishes/manta_1.png
+share/gnome/gcompris/boards/fishes/newf1_0.png
+share/gnome/gcompris/boards/fishes/newf1_1.png
+share/gnome/gcompris/boards/fishes/shark1_0.png
+share/gnome/gcompris/boards/fishes/shark1_1.png
+share/gnome/gcompris/boards/fishes/six_barred_0.png
+share/gnome/gcompris/boards/fishes/six_barred_1.png
+share/gnome/gcompris/boards/fishes/teeth_0.png
+share/gnome/gcompris/boards/fishes/teeth_1.png
+share/gnome/gcompris/boards/fishes/teeth_2.png
+share/gnome/gcompris/boards/fishes/teeth_3.png
+share/gnome/gcompris/boards/fishes/teeth_4.png
+share/gnome/gcompris/boards/fishes/teeth_5.png
+share/gnome/gcompris/boards/fishes/teeth_6.png
+share/gnome/gcompris/boards/fishes/teeth_7.png
+share/gnome/gcompris/boards/gcompris/buttons/bad.png
+share/gnome/gcompris/boards/gcompris/buttons/bar_bg.jpg
+share/gnome/gcompris/boards/gcompris/buttons/button.png
+share/gnome/gcompris/boards/gcompris/buttons/home.png
+share/gnome/gcompris/boards/gcompris/buttons/horver.png
+share/gnome/gcompris/boards/gcompris/buttons/ok.png
+share/gnome/gcompris/boards/gcompris/dice/gnome-dice1.png
+share/gnome/gcompris/boards/gcompris/dice/gnome-dice2.png
+share/gnome/gcompris/boards/gcompris/dice/gnome-dice3.png
+share/gnome/gcompris/boards/gcompris/dice/gnome-dice4.png
+share/gnome/gcompris/boards/gcompris/dice/gnome-dice5.png
+share/gnome/gcompris/boards/gcompris/dice/gnome-dice6.png
+share/gnome/gcompris/boards/gcompris/gcompris-about.jpg
+share/gnome/gcompris/boards/gcompris/gcompris-bg.jpg
+share/gnome/gcompris/boards/gcompris/gcompris-init.jpg
+share/gnome/gcompris/boards/gcompris/letters/*.png
+share/gnome/gcompris/boards/gcompris/letters/+.png
+share/gnome/gcompris/boards/gcompris/letters/-.png
+share/gnome/gcompris/boards/gcompris/letters/0.png
+share/gnome/gcompris/boards/gcompris/letters/1.png
+share/gnome/gcompris/boards/gcompris/letters/2.png
+share/gnome/gcompris/boards/gcompris/letters/3.png
+share/gnome/gcompris/boards/gcompris/letters/4.png
+share/gnome/gcompris/boards/gcompris/letters/5.png
+share/gnome/gcompris/boards/gcompris/letters/6.png
+share/gnome/gcompris/boards/gcompris/letters/7.png
+share/gnome/gcompris/boards/gcompris/letters/8.png
+share/gnome/gcompris/boards/gcompris/letters/9.png
+share/gnome/gcompris/boards/gcompris/letters/:.png
+share/gnome/gcompris/boards/gcompris/letters/=.png
+share/gnome/gcompris/boards/gcompris/letters/?.png
+share/gnome/gcompris/boards/gcompris/letters/A.png
+share/gnome/gcompris/boards/gcompris/letters/B.png
+share/gnome/gcompris/boards/gcompris/letters/C.png
+share/gnome/gcompris/boards/gcompris/letters/D.png
+share/gnome/gcompris/boards/gcompris/letters/E.png
+share/gnome/gcompris/boards/gcompris/letters/F.png
+share/gnome/gcompris/boards/gcompris/letters/G.png
+share/gnome/gcompris/boards/gcompris/letters/H.png
+share/gnome/gcompris/boards/gcompris/letters/I.png
+share/gnome/gcompris/boards/gcompris/letters/J.png
+share/gnome/gcompris/boards/gcompris/letters/K.png
+share/gnome/gcompris/boards/gcompris/letters/L.png
+share/gnome/gcompris/boards/gcompris/letters/M.png
+share/gnome/gcompris/boards/gcompris/letters/N.png
+share/gnome/gcompris/boards/gcompris/letters/O.png
+share/gnome/gcompris/boards/gcompris/letters/P.png
+share/gnome/gcompris/boards/gcompris/letters/Q.png
+share/gnome/gcompris/boards/gcompris/letters/R.png
+share/gnome/gcompris/boards/gcompris/letters/S.png
+share/gnome/gcompris/boards/gcompris/letters/T.png
+share/gnome/gcompris/boards/gcompris/letters/U.png
+share/gnome/gcompris/boards/gcompris/letters/V.png
+share/gnome/gcompris/boards/gcompris/letters/W.png
+share/gnome/gcompris/boards/gcompris/letters/X.png
+share/gnome/gcompris/boards/gcompris/letters/Y.png
+share/gnome/gcompris/boards/gcompris/letters/Z.png
+share/gnome/gcompris/boards/gcompris/letters/a.png
+share/gnome/gcompris/boards/gcompris/letters/b.png
+share/gnome/gcompris/boards/gcompris/letters/c.png
+share/gnome/gcompris/boards/gcompris/letters/d.png
+share/gnome/gcompris/boards/gcompris/letters/e.png
+share/gnome/gcompris/boards/gcompris/letters/f.png
+share/gnome/gcompris/boards/gcompris/letters/g.png
+share/gnome/gcompris/boards/gcompris/letters/h.png
+share/gnome/gcompris/boards/gcompris/letters/i.png
+share/gnome/gcompris/boards/gcompris/letters/j.png
+share/gnome/gcompris/boards/gcompris/letters/k.png
+share/gnome/gcompris/boards/gcompris/letters/l.png
+share/gnome/gcompris/boards/gcompris/letters/m.png
+share/gnome/gcompris/boards/gcompris/letters/n.png
+share/gnome/gcompris/boards/gcompris/letters/o.png
+share/gnome/gcompris/boards/gcompris/letters/p.png
+share/gnome/gcompris/boards/gcompris/letters/q.png
+share/gnome/gcompris/boards/gcompris/letters/r.png
+share/gnome/gcompris/boards/gcompris/letters/s.png
+share/gnome/gcompris/boards/gcompris/letters/t.png
+share/gnome/gcompris/boards/gcompris/letters/u.png
+share/gnome/gcompris/boards/gcompris/letters/v.png
+share/gnome/gcompris/boards/gcompris/letters/w.png
+share/gnome/gcompris/boards/gcompris/letters/x.png
+share/gnome/gcompris/boards/gcompris/letters/y.png
+share/gnome/gcompris/boards/gcompris/letters/z.png
+share/gnome/gcompris/boards/gletters.xml
+share/gnome/gcompris/boards/memory/backcard.png
+share/gnome/gcompris/boards/menu.xml
+share/gnome/gcompris/boards/paintings.xml
+share/gnome/gcompris/boards/paintings/README
+share/gnome/gcompris/boards/paintings/board1_0.xml
+share/gnome/gcompris/boards/paintings/board2_0.xml
+share/gnome/gcompris/boards/paintings/board3_0.xml
+share/gnome/gcompris/boards/paintings/board4_0.xml
+share/gnome/gcompris/boards/paintings/board5_0.xml
+share/gnome/gcompris/boards/paintings/board6_0.xml
+share/gnome/gcompris/boards/paintings/level1/bazille_rampart_1.jpg
+share/gnome/gcompris/boards/paintings/level1/bazille_rampart_2.jpg
+share/gnome/gcompris/boards/paintings/level1/bazille_rampart_3.jpg
+share/gnome/gcompris/boards/paintings/level1/bazille_rampart_4.jpg
+share/gnome/gcompris/boards/paintings/level1/bazille_rampart_5.jpg
+share/gnome/gcompris/boards/paintings/level1/bazille_rampart_6.jpg
+share/gnome/gcompris/boards/paintings/level2/cassat_summertime_1.jpg
+share/gnome/gcompris/boards/paintings/level2/cassat_summertime_2.jpg
+share/gnome/gcompris/boards/paintings/level2/cassat_summertime_3.jpg
+share/gnome/gcompris/boards/paintings/level2/cassat_summertime_4.jpg
+share/gnome/gcompris/boards/paintings/level2/cassat_summertime_5.jpg
+share/gnome/gcompris/boards/paintings/level2/cassat_summertime_6.jpg
+share/gnome/gcompris/boards/paintings/level3/gogh_auvert_1.jpg
+share/gnome/gcompris/boards/paintings/level3/gogh_auvert_2.jpg
+share/gnome/gcompris/boards/paintings/level3/gogh_auvert_3.jpg
+share/gnome/gcompris/boards/paintings/level3/gogh_auvert_4.jpg
+share/gnome/gcompris/boards/paintings/level3/gogh_auvert_5.jpg
+share/gnome/gcompris/boards/paintings/level3/gogh_auvert_6.jpg
+share/gnome/gcompris/boards/paintings/level4/degas_class-dance_1.png
+share/gnome/gcompris/boards/paintings/level4/degas_class-dance_2.png
+share/gnome/gcompris/boards/paintings/level4/degas_class-dance_3.png
+share/gnome/gcompris/boards/paintings/level4/degas_class-dance_4.png
+share/gnome/gcompris/boards/paintings/level4/degas_class-dance_5.png
+share/gnome/gcompris/boards/paintings/level4/degas_class-dance_6.png
+share/gnome/gcompris/boards/paintings/level5/renoir
+share/gnome/gcompris/boards/paintings/level5/renoir-moulin_de_la_galette-1.png
+share/gnome/gcompris/boards/paintings/level5/renoir-moulin_de_la_galette-2.png
+share/gnome/gcompris/boards/paintings/level5/renoir-moulin_de_la_galette-3.png
+share/gnome/gcompris/boards/paintings/level5/renoir-moulin_de_la_galette-4.png
+share/gnome/gcompris/boards/paintings/level5/renoir-moulin_de_la_galette-5.png
+share/gnome/gcompris/boards/paintings/level5/renoir-moulin_de_la_galette-6.png
+share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-1.png
+share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-2.png
+share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-3.png
+share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-4.png
+share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-5.png
+share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-6.png
+share/gnome/gcompris/boards/planegame.xml
+share/gnome/gcompris/boards/planegame/THANKS
+share/gnome/gcompris/boards/planegame/cloud.png
+share/gnome/gcompris/boards/planegame/plane.png
+share/gnome/gcompris/boards/scales/board1_0.xml
+share/gnome/gcompris/boards/scales/board1_1.xml
+share/gnome/gcompris/boards/scales/board1_2.xml
+share/gnome/gcompris/boards/scales/board1_3.xml
+share/gnome/gcompris/boards/scales/board1_4.xml
+share/gnome/gcompris/boards/scales/board1_5.xml
+share/gnome/gcompris/boards/scales/board2_0.xml
+share/gnome/gcompris/boards/scales/board2_1.xml
+share/gnome/gcompris/boards/scales/board2_2.xml
+share/gnome/gcompris/boards/scales/board2_3.xml
+share/gnome/gcompris/boards/scales/board2_4.xml
+share/gnome/gcompris/boards/scales/board2_5.xml
+share/gnome/gcompris/boards/scales/board3_0.xml
+share/gnome/gcompris/boards/scales/board3_1.xml
+share/gnome/gcompris/boards/scales/board3_2.xml
+share/gnome/gcompris/boards/scales/board3_3.xml
+share/gnome/gcompris/boards/scales/board3_4.xml
+share/gnome/gcompris/boards/scales/board3_5.xml
+share/gnome/gcompris/boards/scales/masse.png
+share/gnome/gcompris/boards/scales/masse1.png
+share/gnome/gcompris/boards/scales/masse10.png
+share/gnome/gcompris/boards/scales/masse2.png
+share/gnome/gcompris/boards/scales/masse3.png
+share/gnome/gcompris/boards/scales/masse4.png
+share/gnome/gcompris/boards/scales/masse5.png
+share/gnome/gcompris/boards/scales/masse6.png
+share/gnome/gcompris/boards/scales/masse7.png
+share/gnome/gcompris/boards/scales/masse8.png
+share/gnome/gcompris/boards/scales/masse9.png
+share/gnome/gcompris/boards/scales/scales.png
+share/gnome/gcompris/boards/scalesboard.xml
+share/gnome/gcompris/boards/smallnumbers.xml
+share/gnome/gcompris/boards/wordsgame.xml
+share/gnome/gcompris/boards/wordsgame/wordslevel1.de
+share/gnome/gcompris/boards/wordsgame/wordslevel1.en
+share/gnome/gcompris/boards/wordsgame/wordslevel1.es
+share/gnome/gcompris/boards/wordsgame/wordslevel1.fi
+share/gnome/gcompris/boards/wordsgame/wordslevel1.fr
+share/gnome/gcompris/boards/wordsgame/wordslevel1.it
+share/gnome/gcompris/boards/wordsgame/wordslevel1.pt_BR
+share/gnome/gcompris/boards/wordsgame/wordslevel2.de
+share/gnome/gcompris/boards/wordsgame/wordslevel2.en
+share/gnome/gcompris/boards/wordsgame/wordslevel2.es
+share/gnome/gcompris/boards/wordsgame/wordslevel2.fi
+share/gnome/gcompris/boards/wordsgame/wordslevel2.fr
+share/gnome/gcompris/boards/wordsgame/wordslevel2.it
+share/gnome/gcompris/boards/wordsgame/wordslevel2.pt_BR
+share/gnome/gcompris/boards/wordsgame/wordslevelmax.de
+share/gnome/gcompris/boards/wordsgame/wordslevelmax.en
+share/gnome/gcompris/boards/wordsgame/wordslevelmax.es
+share/gnome/gcompris/boards/wordsgame/wordslevelmax.fi
+share/gnome/gcompris/boards/wordsgame/wordslevelmax.fr
+share/gnome/gcompris/boards/wordsgame/wordslevelmax.it
+share/gnome/gcompris/boards/wordsgame/wordslevelmax.nl
+share/gnome/gcompris/boards/wordsgame/wordslevelmax.pt_BR
 share/gnome/gcompris/sounds/bonus.wav
 share/gnome/gcompris/sounds/crash.wav
 share/gnome/gcompris/sounds/gobble.wav
 share/gnome/help/gcompris/C/gcompris.html
 share/gnome/help/gcompris/C/overview.jpg
 share/gnome/help/gcompris/C/topic.dat
-share/gnome/pixmaps/gnome-compris.png
+share/gnome/pixmaps/gcompris.png
 share/locale/de.mo/LC_MESSAGES/gcompris.mo
 share/locale/es.mo/LC_MESSAGES/gcompris.mo
 share/locale/fi.mo/LC_MESSAGES/gcompris.mo
@@ -241,22 +304,23 @@ share/locale/pt_BR.mo/LC_MESSAGES/gcompris.mo
 @dirrm share/gnome/help/gcompris/C
 @dirrm share/gnome/help/gcompris
 @dirrm share/gnome/gcompris/sounds
-@dirrm share/gnome/gcompris/pixmaps/shapes/level6
-@dirrm share/gnome/gcompris/pixmaps/shapes/level5
-@dirrm share/gnome/gcompris/pixmaps/shapes/level4
-@dirrm share/gnome/gcompris/pixmaps/shapes/level3
-@dirrm share/gnome/gcompris/pixmaps/shapes/level2
-@dirrm share/gnome/gcompris/pixmaps/shapes/level1
-@dirrm share/gnome/gcompris/pixmaps/shapes
-@dirrm share/gnome/gcompris/pixmaps/planegame
-@dirrm share/gnome/gcompris/pixmaps/memory
-@dirrm share/gnome/gcompris/pixmaps/letters
-@dirrm share/gnome/gcompris/pixmaps/gameicons
-@dirrm share/gnome/gcompris/pixmaps/dice
-@dirrm share/gnome/gcompris/pixmaps/buttons
-@dirrm share/gnome/gcompris/pixmaps/animals
-@dirrm share/gnome/gcompris/pixmaps
-@dirrm share/gnome/gcompris/data/wordsgame
-@dirrm share/gnome/gcompris/data/shapesgame
-@dirrm share/gnome/gcompris/data
+@dirrm share/gnome/gcompris/boards/wordsgame
+@dirrm share/gnome/gcompris/boards/scales
+@dirrm share/gnome/gcompris/boards/planegame
+@dirrm share/gnome/gcompris/boards/paintings/level6
+@dirrm share/gnome/gcompris/boards/paintings/level5
+@dirrm share/gnome/gcompris/boards/paintings/level4
+@dirrm share/gnome/gcompris/boards/paintings/level3
+@dirrm share/gnome/gcompris/boards/paintings/level2
+@dirrm share/gnome/gcompris/boards/paintings/level1
+@dirrm share/gnome/gcompris/boards/paintings
+@dirrm share/gnome/gcompris/boards/memory
+@dirrm share/gnome/gcompris/boards/gcompris/letters
+@dirrm share/gnome/gcompris/boards/gcompris/dice
+@dirrm share/gnome/gcompris/boards/gcompris/buttons
+@dirrm share/gnome/gcompris/boards/gcompris
+@dirrm share/gnome/gcompris/boards/fishes
+@dirrm share/gnome/gcompris/boards/boardicons
+@dirrm share/gnome/gcompris/boards
 @dirrm share/gnome/gcompris
+@dirrm lib/gcompris