release of 0.9.5: small graphical improvment. Better management of boards installR0_9_5

15 files changed, 17 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index a7ca256..1753154 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* src/gcompris/bar.c: shifted all buttons on the left to free the home
 	* src/gcompris/bonus.[ch]: implemented BONUS_RANDOM, changed bonus.h to be an enum
 	* src/boards/Makefile.am: changed PTHREAD_LIBS by PTHREAD_LIB as it should be
+	* src/gcompris/pluginenum.c: changed to avoid a // in the plugin file path
+	* src/boards/menu.c: changed to add more space between the two menu lines
+	* boards/boardicons/railroad.png: made it smaller to be closed to other icons
 
 2001-11-25 Pascal Georges <pascal.georges1@free.fr
 	* src/gcompris/gameutil.c : added convertUTF8Toisolat1 function
diff --git a/Makefile.am b/Makefile.am
index 4750964..e82aad9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,13 +27,15 @@ install-data-local:
 	@$(NORMAL_INSTALL)
 	if test -d @PACKAGE_DATA_DIR@; then \
 	  $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@; \
-	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics --exclude .in --exclude ~ * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
+	  cd @PACKAGE_DATA_DIR@ ; find . -name \*~ -or -name \*.in  -printf \"%f\n\" >/tmp/GCOMPRIS_LIST.txt ; cd .. ; \
+	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics --exclude-from  /tmp/GCOMPRIS_LIST.txt * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
+	  rm -f /tmp/GCOMPRIS_LIST.txt ; \
 	fi
 
 dist-hook:
 	if test -d @PACKAGE_DATA_DIR@; then \
 	  $(mkinstalldirs) $(distdir)/@PACKAGE_DATA_DIR@; \
-	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics --exclude ~ * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
+	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
 	fi
 
 
diff --git a/Makefile.in b/Makefile.in
index 699aed5..031837c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -498,13 +498,15 @@ install-data-local:
 	@$(NORMAL_INSTALL)
 	if test -d @PACKAGE_DATA_DIR@; then \
 	  $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@; \
-	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics --exclude .in --exclude ~ * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
+	  cd @PACKAGE_DATA_DIR@ ; find . -name \*~ -or -name \*.in  -printf \"%f\n\" >/tmp/GCOMPRIS_LIST.txt ; cd .. ; \
+	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics --exclude-from  /tmp/GCOMPRIS_LIST.txt * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
+	  rm -f /tmp/GCOMPRIS_LIST.txt ; \
 	fi
 
 dist-hook:
 	if test -d @PACKAGE_DATA_DIR@; then \
 	  $(mkinstalldirs) $(distdir)/@PACKAGE_DATA_DIR@; \
-	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics --exclude ~ * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
+	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics * | ( 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/boards/Makefile.am b/boards/Makefile.am
index 1a2f97c..7715e85 100644
--- a/boards/Makefile.am
+++ b/boards/Makefile.am
@@ -1,4 +1,4 @@
-xmldir = $(datadir)/xml
+xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
 
 xml_in_files = \
 	algebramenu.xml.in \
@@ -42,4 +42,4 @@ xml_DATA = $(xml_in_files:.xml.in=.xml)
 
 @XML_I18N_MERGE_XML_RULE@
 
-EXTRA_DIST=$(xml_in_files) $(xml_DATA)
+
diff --git a/boards/Makefile.in b/boards/Makefile.in
index 70248b8..0f73a96 100644
--- a/boards/Makefile.in
+++ b/boards/Makefile.in
@@ -130,14 +130,12 @@ cflags_set = @cflags_set@
 cxxflags_set = @cxxflags_set@
 plugindir = @plugindir@
 
-xmldir = $(datadir)/xml
+xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
 
 xml_in_files =  	algebramenu.xml.in 	algebra_plus.xml.in 	algebra_minus.xml.in 	algebra_by.xml.in 	algebra_div.xml.in 	babymatch.xml.in 	babyshapes.xml.in 	clickgame.xml.in 	clockgame.xml.in 	computer.xml.in 	draw.xml.in 	fun.xml.in 	gletters.xml.in 	imagename.xml.in 	locale.xml.in 	locale_de.xml.in 	locale_en.xml.in 	locale_es.xml.in 	locale_fr.xml.in 	locale_sv.xml.in 	memory.xml.in 	menu.xml.in 	paintings.xml.in 	paratrooper.xml.in 	planegame.xml.in 	readingh.xml.in 	readingv.xml.in 	reading.xml.in 	scalesboard.xml.in 	smallnumbers.xml.in 	wordsgame.xml.in 	imageid.xml.in 	missing_letter.xml.in 	click_on_letter.xml.in 	railroad.xml.in 	erase.xml.in
 
 
 xml_DATA = $(xml_in_files:.xml.in=.xml)
-
-EXTRA_DIST = $(xml_in_files) $(xml_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
diff --git a/boards/boardicons/babymatch.png b/boards/boardicons/babymatch.png
index 5fadaec..000ea44 100644
--- a/boards/boardicons/babymatch.png
+++ b/boards/boardicons/babymatch.png
diff --git a/boards/boardicons/planegame.png b/boards/boardicons/planegame.png
index 0522685..a65e5b7 100644
--- a/boards/boardicons/planegame.png
+++ b/boards/boardicons/planegame.png
diff --git a/boards/boardicons/railroad.png b/boards/boardicons/railroad.png
index 21d9446..ac042c3 100644
--- a/boards/boardicons/railroad.png
+++ b/boards/boardicons/railroad.png
diff --git a/boards/gcompris/gcompris-about.jpg b/boards/gcompris/gcompris-about.jpg
index 421d3f9..69cf96e 100644
--- a/boards/gcompris/gcompris-about.jpg
+++ b/boards/gcompris/gcompris-about.jpg
diff --git a/boards/gcompris/misc/tuxplane.png b/boards/gcompris/misc/tuxplane.png
index cabc761..a2bc3af 100644
--- a/boards/gcompris/misc/tuxplane.png
+++ b/boards/gcompris/misc/tuxplane.png
diff --git a/boards/railroad/loco2.png b/boards/railroad/loco2.png
index a88c700..3c64c4a 100644
--- a/boards/railroad/loco2.png
+++ b/boards/railroad/loco2.png
diff --git a/boards/railroad/loco5.png b/boards/railroad/loco5.png
index 4aa116c..7af8580 100644
--- a/boards/railroad/loco5.png
+++ b/boards/railroad/loco5.png
diff --git a/boards/railroad/wagon3.png b/boards/railroad/wagon3.png
index 928b9ad..9d5d4db 100644
--- a/boards/railroad/wagon3.png
+++ b/boards/railroad/wagon3.png
diff --git a/src/boards/menu.c b/src/boards/menu.c
index 8e4b4e0..a81e60b 100644
--- a/src/boards/menu.c
+++ b/src/boards/menu.c
@@ -1,6 +1,6 @@
 /* gcompris - menu.c
  *
- * Time-stamp: <2001/11/06 22:21:59 bruno>
+ * Time-stamp: <2001/11/26 00:00:14 bruno>
  *
  * Copyright (C) 2000 Bruno Coudoin
  *
@@ -231,7 +231,7 @@ static gboolean next_spot()
   if(current_x>=gcomprisBoard->width-100)
     {
       current_x = gcomprisBoard->width/MENU_PER_LINE;
-      current_y += 100;
+      current_y += 120;
     }
 
   return(TRUE);
diff --git a/src/gcompris/pluginenum.c b/src/gcompris/pluginenum.c
index d9e1e7a..d44133e 100644
--- a/src/gcompris/pluginenum.c
+++ b/src/gcompris/pluginenum.c
@@ -188,7 +188,7 @@ void scan_plugins(char *dirname)
 
 	while ((ent = readdir(dir)) != NULL)
 	{
-		filename = g_strdup_printf("%s/%s", dirname, ent->d_name);
+		filename = g_strdup_printf("%s%s", dirname, ent->d_name);
 		if (!stat(filename, &statbuf) && S_ISREG(statbuf.st_mode) &&
 		    (ext = strrchr(ent->d_name, '.')) != NULL)
 			if (!strcmp(ext, SHARED_LIB_EXT))