[Tux4kids-commits] r401 - in tuxmath/trunk: . data/images/sprites doc po src
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Mon Dec 31 19:34:28 UTC 2007
Author: dbruce-guest
Date: 2007-12-31 19:34:28 +0000 (Mon, 31 Dec 2007)
New Revision: 401
Modified:
tuxmath/trunk/Makefile.am
tuxmath/trunk/config.h.in
tuxmath/trunk/configure.ac
tuxmath/trunk/cross-configure.sh
tuxmath/trunk/data/images/sprites/Makefile.in
tuxmath/trunk/doc/INSTALL.txt
tuxmath/trunk/doc/changelog
tuxmath/trunk/notesblurb
tuxmath/trunk/po/en at boldquot.po
tuxmath/trunk/po/en at quot.po
tuxmath/trunk/src/Makefile.in
tuxmath/trunk/src/credits.c
tuxmath/trunk/src/lessons.c
tuxmath/trunk/src/options.c
tuxmath/trunk/src/setup.c
tuxmath/trunk/src/tuxmathadmin.c
Log:
cleanup of configure.ac
Modified: tuxmath/trunk/Makefile.am
===================================================================
--- tuxmath/trunk/Makefile.am 2007-12-31 14:10:59 UTC (rev 400)
+++ tuxmath/trunk/Makefile.am 2007-12-31 19:34:28 UTC (rev 401)
@@ -1,10 +1,10 @@
## Top-level Makefile.am for tuxmath:
## Process with Automake to create Makefile.in
-SUBDIRS = intl \
+SUBDIRS = doc \
+ intl \
po \
src \
- data \
- doc
+ data
ACLOCAL_AMFLAGS = -I m4
@@ -96,17 +96,13 @@
install-nsi-am: install-nsi-local
-##if NO_NSIS
-##nsis: all
-## @echo "\nError - Nullsoft Scriptable Installer System (NSIS) not installed - cannot build ##executable installer!\nDownload NSIS from:\nhttp://nsis.sourceforge.net/Download\nRe-run ##'./configure' after installing NSIS\n";
-##else
-##nsis: install-nsi-local
-## $(MAKENSIS) -NOCD nsis/tuxmath.nsi
-##endif
nsis: install-nsi-local
+#if NSI_USE_TUXMATH_CONF
+# $(MAKENSIS) -NOCD nsis/tuxmath_with_conf.nsi
+#else
$(MAKENSIS) -NOCD nsis/tuxmath.nsi
+#endif
-
clean-local:
@$(NORMAL_CLEAN)
if test -d $(NSI_INSTALL_DIR); then \
Modified: tuxmath/trunk/config.h.in
===================================================================
--- tuxmath/trunk/config.h.in 2007-12-31 14:10:59 UTC (rev 400)
+++ tuxmath/trunk/config.h.in 2007-12-31 19:34:28 UTC (rev 401)
@@ -40,6 +40,9 @@
/* Define to 1 if you have the `asprintf' function. */
#undef HAVE_ASPRINTF
+/* Define to 1 if you have the `atexit' function. */
+#undef HAVE_ATEXIT
+
/* Define to 1 if the compiler understands __builtin_expect. */
#undef HAVE_BUILTIN_EXPECT
@@ -79,6 +82,9 @@
*/
#undef HAVE_DIRENT_H
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+#undef HAVE_DOPRNT
+
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
@@ -152,6 +158,9 @@
/* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
+/* Define to 1 if you have the `memmove' function. */
+#undef HAVE_MEMMOVE
+
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
@@ -173,6 +182,9 @@
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
#undef HAVE_NDIR_H
+/* Define to 1 if you have the `nl_langinfo' function. */
+#undef HAVE_NL_LANGINFO
+
/* Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro if
_GNU_SOURCE is defined. */
#undef HAVE_NL_LOCALE_NAME
@@ -186,6 +198,9 @@
/* Define if the POSIX multithreading library has read/write locks. */
#undef HAVE_PTHREAD_RWLOCK
+/* Define to 1 if the system has the type `ptrdiff_t'. */
+#undef HAVE_PTRDIFF_T
+
/* Define to 1 if you have the `putenv' function. */
#undef HAVE_PUTENV
@@ -198,6 +213,13 @@
/* Define to 1 if you have the `snprintf' function. */
#undef HAVE_SNPRINTF
+/* Define to 1 if `stat' has the bug that it succeeds when given the
+ zero-length file name argument. */
+#undef HAVE_STAT_EMPTY_STRING_BUG
+
+/* Define to 1 if stdbool.h conforms to C99. */
+#undef HAVE_STDBOOL_H
+
/* Define to 1 if you have the <stddef.h> header file. */
#undef HAVE_STDDEF_H
@@ -223,6 +245,13 @@
/* Define to 1 if you have the `strchr' function. */
#undef HAVE_STRCHR
+/* Define to 1 if you have the `strcoll' function and it is properly defined.
+ */
+#undef HAVE_STRCOLL
+
+/* Define to 1 if you have the `strcspn' function. */
+#undef HAVE_STRCSPN
+
/* Define to 1 if you have the `strdup' function. */
#undef HAVE_STRDUP
@@ -232,9 +261,15 @@
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
+/* Define to 1 if you have the `strncasecmp' function. */
+#undef HAVE_STRNCASECMP
+
/* Define to 1 if you have the `strndup' function. */
#undef HAVE_STRNDUP
+/* Define to 1 if you have the `strstr' function. */
+#undef HAVE_STRSTR
+
/* Define to 1 if you have the `strtoul' function. */
#undef HAVE_STRTOUL
@@ -274,6 +309,9 @@
declarations. */
#undef HAVE_VISIBILITY
+/* Define to 1 if you have the `vprintf' function. */
+#undef HAVE_VPRINTF
+
/* Define to 1 if you have the <wchar.h> header file. */
#undef HAVE_WCHAR_H
@@ -286,6 +324,18 @@
/* Define if you have the 'wint_t' type. */
#undef HAVE_WINT_T
+/* Define to 1 if the system has the type `_Bool'. */
+#undef HAVE__BOOL
+
+/* Define to 1 if you have the `__argz_count' function. */
+#undef HAVE___ARGZ_COUNT
+
+/* Define to 1 if you have the `__argz_next' function. */
+#undef HAVE___ARGZ_NEXT
+
+/* Define to 1 if you have the `__argz_stringify' function. */
+#undef HAVE___ARGZ_STRINGIFY
+
/* Define to 1 if you have the `__fsetlocking' function. */
#undef HAVE___FSETLOCKING
@@ -295,6 +345,10 @@
/* Define if integer division by zero raises signal SIGFPE. */
#undef INTDIV0_RAISES_SIGFPE
+/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
+ slash. */
+#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
+
/* Name of package */
#undef PACKAGE
@@ -369,12 +423,18 @@
# undef _GNU_SOURCE
#endif
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */
#ifndef __cplusplus
#undef inline
#endif
+/* Define to `int' if <sys/types.h> does not define. */
+#undef mode_t
+
/* Define as the type of the result of subtracting two pointers, if the system
doesn't define it. */
#undef ptrdiff_t
@@ -386,7 +446,11 @@
<inttypes.h> don't define. */
#undef uintmax_t
+/* Define to empty if the keyword `volatile' does not work. Warning: valid
+ code using `volatile' can become incorrect without. Disable with care. */
+#undef volatile
+
#define __libc_lock_t gl_lock_t
#define __libc_lock_define gl_lock_define
#define __libc_lock_define_initialized gl_lock_define_initialized
Modified: tuxmath/trunk/configure.ac
===================================================================
--- tuxmath/trunk/configure.ac 2007-12-31 14:10:59 UTC (rev 400)
+++ tuxmath/trunk/configure.ac 2007-12-31 19:34:28 UTC (rev 401)
@@ -1,6 +1,6 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_INIT([Tux Of Math Command],[1.5.9],[tuxmath-devel at lists.sourceforge.net],[tuxmath])
+AC_INIT([Tux Of Math Command],[1.6.0],[tuxmath-devel at lists.sourceforge.net],[tuxmath])
AC_CONFIG_SRCDIR([src/tuxmath.c])
AC_PREREQ(2.61)
@@ -9,15 +9,26 @@
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(foreign)
+AC_CONFIG_SRCDIR([config.h.in])
+AC_CONFIG_HEADER([config.h])
-AC_CONFIG_HEADERS([config.h])
-LDFLAGS= "$LDFLAGS -I."
+NAME_VERSION=$PACKAGE-$VERSION
-NAME_VERSION=$PACKAGE-$VERSION
AC_DEFINE_UNQUOTED([PROGRAM_NAME], "$PACKAGE", [Tux Of Math Command])
+
AC_SUBST(NAME_VERSION)
+# Needed for gettext:
+AC_GNU_SOURCE
+AM_GNU_GETTEXT_VERSION([0.16])
+AM_GNU_GETTEXT
+AM_GNU_GETTEXT_INTL_SUBDIR
+
+
+# ----------------------------------------------------------------------
# Checks for programs.
+# ----------------------------------------------------------------------
+
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_MAKE_SET
@@ -28,28 +39,20 @@
AC_PROG_YACC
-# Checks for header files.
-AC_GNU_SOURCE
-AC_FUNC_ALLOCA
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_CHECK_HEADERS([argz.h fcntl.h float.h inttypes.h langinfo.h libintl.h limits.h locale.h malloc.h stddef.h stdint.h stdio_ext.h stdlib.h string.h strings.h sys/param.h unistd.h wchar.h])
+# -----------------------------------------------------------------------
+# Checks for libraries.
+# -----------------------------------------------------------------------
-# Needed for gettext:
-
-AM_GNU_GETTEXT_VERSION([0.16])
-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_INTL_SUBDIR
-
-dnl Check for SDL
+# Check for SDL
SDL_VERSION=1.2.0
AM_PATH_SDL($SDL_VERSION, :,
- AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
+ AC_MSG_ERROR([SDL version $SDL_VERSION not found! http://www.libsdl.org])
)
CFLAGS="$CFLAGS $SDL_CFLAGS"
+
# Check platform - see if WinMain needed:
AC_MSG_CHECKING([for native Win32])
case "$host" in
@@ -62,30 +65,28 @@
esac
AC_MSG_RESULT([$native_win32])
-AM_CONDITIONAL(BUILD_MINGW32, test "$native_win32" = yes)
-if test "$native_win32" = yes; then
- LIBS="$LIBS -lmingw32 -lSDLmain -lSDL"
-fi
+AM_CONDITIONAL(BUILD_MINGW32, test $native_win32 = yes)
-AM_CONDITIONAL(BUILD_MINGW32, test "$native_win32" = no)
-if test "$native_win32" = no; then
-LIBS="$LIBS $SDL_LIBS"
+if test $native_win32 = yes; then
+ LIBS="$LIBS -lmingw32 -lSDLmain -lSDL"
+else
+ LIBS="$LIBS $SDL_LIBS"
fi
-# Checks for libraries.
+
dnl Check for SDL_image:
AC_CHECK_LIB([SDL_image],
[IMG_Load],
LIBS="$LIBS -lSDL_image",
- [AC_MSG_ERROR([*** SDL_image library not found!])]
+ [AC_MSG_ERROR([SDL_image not found! http://www.libsdl.org/projects/SDL_image])]
)
dnl Check for SDL_mixer:.
AC_CHECK_LIB([SDL_mixer],
[Mix_OpenAudio],
LIBS="$LIBS -lSDL_mixer",
- [AC_MSG_ERROR([*** SDL_mixer library not found!])]
+ [AC_MSG_ERROR([SDL_mixer not found! http://www.libsdl.org/projects/SDL_mixer])]
)
dnl Check for SDL_ttf:
@@ -96,65 +97,102 @@
)
+
+
+# --------------------------------------------------------------------------------------
# Checks for header files.
+# --------------------------------------------------------------------------------------
+
+AC_FUNC_ALLOCA
AC_HEADER_DIRENT
AC_HEADER_STDC
-AC_CHECK_HEADERS([stdlib.h string.h unistd.h iconv.h])
+AC_CHECK_HEADERS([argz.h fcntl.h float.h iconv.h inttypes.h langinfo.h libintl.h limits.h locale.h malloc.h stddef.h stdint.h stdio_ext.h stdlib.h string.h strings.h sys/param.h unistd.h wchar.h])
+
+# --------------------------------------------------------------------------------------------
# Checks for typedefs, structures, and compiler characteristics.
+# --------------------------------------------------------------------------------------------
+AC_HEADER_STDBOOL
+AC_C_CONST
+AC_C_INLINE
+AC_TYPE_MODE_T
+AC_TYPE_SIZE_T
+AC_C_VOLATILE
+AC_CHECK_TYPES([ptrdiff_t])
+
+
+
+# -------------------------------------------------------------------------------------------
# Checks for library functions.
+# -------------------------------------------------------------------------------------------
+
+
AC_FUNC_CLOSEDIR_VOID
+AC_FUNC_ERROR_AT_LINE
#AC_FUNC_MALLOC
+AC_FUNC_MMAP
+#AC_FUNC_REALLOC
+AC_FUNC_STAT
+AC_FUNC_STRCOLL
AC_FUNC_STRTOD
-AC_CHECK_FUNCS([getcwd memset mkdir strcasecmp strchr strndup])
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify atexit getcwd memmove mempcpy memset mkdir munmap nl_langinfo setlocale stpcpy strcasecmp strchr strcspn strdup strncasecmp strndup strstr strtoul])
-dnl Set PACKAGE_DATA_DIR
+# Set PACKAGE_DATA_DIR
PACKAGE_DATA_DIR="data"
+AC_SUBST(PACKAGE_DATA_DIR)
-AM_CONDITIONAL(BUILD_MINGW32, test "$native_win32" = yes)
+#AM_CONDITIONAL(BUILD_MINGW32, test "$native_win32" = yes)
-if test "$native_win32" = yes; then
+if test $native_win32 = yes; then
AC_DEFINE([BUILD_MINGW32], 1,[Native MinGW32 build])
CFLAGS="$CFLAGS -D__GW32__"
LIBS="$LIBS -luuid -lole32 -lwsock32 -mwindows"
CPPFLAGS="$CPPFLAGS -idirafter $prefix/include/glibc"
- #CPPFLAGS="$CPPFLAGS -I$prefix/include/glibc"
AC_PATH_PROG(WINDRES, "$target_alias-windres", no, [$PATH])
fi
-AC_SUBST(PACKAGE_DATA_DIR)
+# ------------------------------------------------------------
+# Support for building NSIS Win32 installer:
+# ------------------------------------------------------------
-# Support for building NSIS Win32 installer:
NSI_INSTALL_DIR=mingw32
AC_SUBST(NSI_INSTALL_DIR)
NSI_DLL_DIR=~/tuxmath_dll
AC_ARG_WITH(dll-directory,AS_HELP_STRING([--with-dll-directory=path],[set the path where dll for TuxMath are [$(NSI_DLL_DIR)]]), dll_path=$withval, dll_path=no)
-AM_CONDITIONAL(NSI_BUILD, test "$dll_path" = no)
+AM_CONDITIONAL(NSI_BUILD, test $dll_path = no)
if test $dll_path != no; then
NSI_DLL_DIR=$dll_path
fi
AC_SUBST(NSI_DLL_DIR)
-NSI_TUXMATH_CONF_DIR=no
-AC_ARG_WITH(tuxmath_config-directory,AS_HELP_STRING([--with-tuxmath_config-directory=path],[set the path where dll for TuxMath are [$(NSI_TUXMATH_CONF_DIR)]]), tuxmath_config_path=$withval, tuxmath_config_path=no)
+AC_PATH_PROG(NSIS, makensis, no, [$PATH])
-AM_CONDITIONAL(NSI_USE_TUXMATH_CONF, test "$tuxmath_config_path" != no)
-if test $tuxmath_config_path != no; then
-NSI_TUXMATH_CONF_DIR=$tuxmath_config_path
-fi
+# --------------------------------------------------------------------------
+# Support for old Qt-based config prog - get rid of this soon:
+# --------------------------------------------------------------------------
+#NSI_TUXMATH_CONF_DIR=no
+#AC_ARG_WITH(tuxmath_config-directory,AS_HELP_STRING([--with-tuxmath_config-directory=path],[set the #path where dll for TuxMath are [$(NSI_TUXMATH_CONF_DIR)]]), tuxmath_config_path=$withval, #tuxmath_config_path=no)
+#
+#AM_CONDITIONAL(NSI_USE_TUXMATH_CONF, test "$tuxmath_config_path" != no)
+#
+#if test $tuxmath_config_path != no; then
+#NSI_TUXMATH_CONF_DIR=$tuxmath_config_path
+#fi
+#AC_SUBST(NSI_TUXMATH_CONF_DIR)
-AC_SUBST(NSI_TUXMATH_CONF_DIR)
-AC_PATH_PROG(NSIS, makensis, no, [$PATH])
-## AM_CONDITIONAL([NO_NSIS], [test [$NSIS]=[no]])
+# ---------------------------------------------------------------
+# Create Makefiles
+# ---------------------------------------------------------------
AC_CONFIG_FILES([
Makefile
Modified: tuxmath/trunk/cross-configure.sh
===================================================================
--- tuxmath/trunk/cross-configure.sh 2007-12-31 14:10:59 UTC (rev 400)
+++ tuxmath/trunk/cross-configure.sh 2007-12-31 19:34:28 UTC (rev 401)
@@ -10,10 +10,10 @@
SDL_CONFIG="$PREFIX/$TARGET/bin/$TARGET-sdl-config"
export SDL_CONFIG
fi
-cache=cross-config.cache
-CPPFLAGS=-I$PREFIX/$TARGET/include LDFLAGS=-L$PREFIX/$TARGET/lib sh configure --cache-file="$cache" \
- --target=$TARGET --host=$TARGET --build=i386-linux --prefix="$PREFIX/$TARGET" \
+
+CPPFLAGS=-I$PREFIX/$TARGET/include LDFLAGS=-L$PREFIX/$TARGET/lib sh configure \
+ --target=$TARGET --host=$TARGET --build=x86_64-linux --prefix="$PREFIX/$TARGET" \
$*
status=$?
-rm -f "$cache"
+
exit $status
Modified: tuxmath/trunk/data/images/sprites/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile.in 2007-12-31 14:10:59 UTC (rev 400)
+++ tuxmath/trunk/data/images/sprites/Makefile.in 2007-12-31 19:34:28 UTC (rev 401)
@@ -140,7 +140,6 @@
NSIS = @NSIS@
NSI_DLL_DIR = @NSI_DLL_DIR@
NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
-NSI_TUXMATH_CONF_DIR = @NSI_TUXMATH_CONF_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
Modified: tuxmath/trunk/doc/INSTALL.txt
===================================================================
--- tuxmath/trunk/doc/INSTALL.txt 2007-12-31 14:10:59 UTC (rev 400)
+++ tuxmath/trunk/doc/INSTALL.txt 2007-12-31 19:34:28 UTC (rev 401)
@@ -1,7 +1,7 @@
INSTALL.txt for "Tux, Of Math Command" (aka "Tuxmath")
-Version 1.5.7
+Version 1.6.10
-October 29, 2007
+December 19, 2007
Requirements
@@ -131,9 +131,15 @@
Compiling the Program
---------------------
You can build Tuxmath either with the latest subversion checkout or
- using a convenient source tar.gz distribution package. The svn
- repository is located at:
+ using a convenient source tar.gz distribution package. The current
+ website is:
+ http://www.tux4kids.com
+
+ where you generally can find the latest tuxmath*tar.gz package.
+
+ The svn repository is located at:
+
http://svn.debian.org/wsvn/tux4kids/tuxmath
or:
@@ -145,8 +151,7 @@
do a typical configure, make, and install. In other words, the
tarball contains a complete "GNU Build System". Note, however, that
you will need the "-dev" files for SDL, SDL_image, SDL_mixer, and
- SDL_ttf. You also need Gnu gettext as "msgfmt" is called during the
- installation.
+ SDL_ttf.
For example:
Modified: tuxmath/trunk/doc/changelog
===================================================================
--- tuxmath/trunk/doc/changelog 2007-12-31 14:10:59 UTC (rev 400)
+++ tuxmath/trunk/doc/changelog 2007-12-31 19:34:28 UTC (rev 401)
@@ -54,7 +54,17 @@
* Add documentation on tuxmathadmin in the README.txt file.
Tim Holy <holy at wustl.edu>
-
+
+2007.Dec.18 (svn.debian.org/tux4kids -?)
+Version 1.6.0
+ Build:
+ * Successful crossbuild for Windows with functioning gettext. The
+ significant change within tuxmath was elimination of the use of
+ libgw32c.a - most of work was building mingw environment and all
+ needed libs from source with rigorous attention to documentation
+ and help from autotools, mingw, and gettext mailing lists.
+ David Bruce <dbruce at tampabay.rr.com>
+
2007.Dec.07 (svn.debian.org/tux4kids - revision 359)
Version 1.5.9
David Bruce <dbruce at tampabay.rr.com>
Modified: tuxmath/trunk/notesblurb
===================================================================
--- tuxmath/trunk/notesblurb 2007-12-31 14:10:59 UTC (rev 400)
+++ tuxmath/trunk/notesblurb 2007-12-31 19:34:28 UTC (rev 401)
@@ -1,3 +1,3 @@
-Source tar.gz archive for TuxMath 1.5.8, including the Andika font. Suitable for installation on Unix-style systems using a simple "./configure; make; make install".
+Source tar.gz archive for TuxMath 1.6.0, including the Andika font. Suitable for installation on Unix-style systems using a simple "./configure; make; make install".
Build requires the *-dev files for SDL, SDL_image, SDL_mixer, and SDL_ttf. Gnu gettext is no longer required for installation. All of these should be easily available in most Gnu-Linux distributions. The Gnu Autotools are not needed to build from this package.
\ No newline at end of file
Modified: tuxmath/trunk/po/en at boldquot.po
===================================================================
--- tuxmath/trunk/po/en at boldquot.po 2007-12-31 14:10:59 UTC (rev 400)
+++ tuxmath/trunk/po/en at boldquot.po 2007-12-31 19:34:28 UTC (rev 401)
@@ -29,7 +29,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Tux Of Math Command 1.5.9\n"
+"Project-Id-Version: Tux Of Math Command 1.6.0\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
"POT-Creation-Date: 2007-12-05 18:15-0500\n"
"PO-Revision-Date: 2007-12-05 18:15-0500\n"
Modified: tuxmath/trunk/po/en at quot.po
===================================================================
--- tuxmath/trunk/po/en at quot.po 2007-12-31 14:10:59 UTC (rev 400)
+++ tuxmath/trunk/po/en at quot.po 2007-12-31 19:34:28 UTC (rev 401)
@@ -26,7 +26,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Tux Of Math Command 1.5.9\n"
+"Project-Id-Version: Tux Of Math Command 1.6.0\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
"POT-Creation-Date: 2007-12-05 18:15-0500\n"
"PO-Revision-Date: 2007-12-05 18:15-0500\n"
Modified: tuxmath/trunk/src/Makefile.in
===================================================================
--- tuxmath/trunk/src/Makefile.in 2007-12-31 14:10:59 UTC (rev 400)
+++ tuxmath/trunk/src/Makefile.in 2007-12-31 19:34:28 UTC (rev 401)
@@ -171,7 +171,6 @@
NSIS = @NSIS@
NSI_DLL_DIR = @NSI_DLL_DIR@
NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
-NSI_TUXMATH_CONF_DIR = @NSI_TUXMATH_CONF_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
Modified: tuxmath/trunk/src/credits.c
===================================================================
--- tuxmath/trunk/src/credits.c 2007-12-31 14:10:59 UTC (rev 400)
+++ tuxmath/trunk/src/credits.c 2007-12-31 19:34:28 UTC (rev 401)
@@ -91,7 +91,7 @@
"",
"",
"-WEBSITE",
- "TUX4KIDS.DEBIAN.ALIOTH.ORG",
+ "WWW.TUX4KIDS.COM",
"", /* The following blanks cause the screen to scroll to complete blank: */
"",
"",
Modified: tuxmath/trunk/src/lessons.c
===================================================================
--- tuxmath/trunk/src/lessons.c 2007-12-31 14:10:59 UTC (rev 400)
+++ tuxmath/trunk/src/lessons.c 2007-12-31 19:34:28 UTC (rev 401)
@@ -83,7 +83,7 @@
}
-/* Write lessons gold star list provided FILE* in format */
+/* Write lessons gold star list to the provided FILE* in format */
/* compatible with read_goldstars_fp () above. */
void write_goldstars_fp(FILE* fp)
@@ -120,12 +120,13 @@
return;
}
+/* FIXME need to get correct function - basename() wasn't correct */
/* Perform a strcasecmp() on two path strings, stripping away all the */
/* dirs in the path and just comparing the filenames themselves: */
static int filename_comp(const unsigned char* s1, const unsigned char* s2)
{
- char* f1 = s1;//basename(s1);
- char* f2 = s2;//basename(s2);
+ char* f1 = s1; //basename(s1);
+ char* f2 = s2; //basename(s2);
return strcasecmp(f1, f2);
}
Modified: tuxmath/trunk/src/options.c
===================================================================
--- tuxmath/trunk/src/options.c 2007-12-31 14:10:59 UTC (rev 400)
+++ tuxmath/trunk/src/options.c 2007-12-31 19:34:28 UTC (rev 401)
@@ -12,7 +12,7 @@
dbruce at tampabay.rr.com
Part of "Tux4Kids" Project
- http://tux4kids.alioth.debian.org
+ http://www.tux4kids.com
August 26, 2001 - July 11, 2007
*/
Modified: tuxmath/trunk/src/setup.c
===================================================================
--- tuxmath/trunk/src/setup.c 2007-12-31 14:10:59 UTC (rev 400)
+++ tuxmath/trunk/src/setup.c 2007-12-31 19:34:28 UTC (rev 401)
@@ -14,7 +14,7 @@
dbruce at tampabay.rr.com
Part of "Tux4Kids" Project
- http://tux4kids.alioth.debian.org/
+ http://www.tux4kids.com/
Subversion repository:
https://svn.debian.alioth.org/tux4kids/tuxmath/
Modified: tuxmath/trunk/src/tuxmathadmin.c
===================================================================
--- tuxmath/trunk/src/tuxmathadmin.c 2007-12-31 14:10:59 UTC (rev 400)
+++ tuxmath/trunk/src/tuxmathadmin.c 2007-12-31 19:34:28 UTC (rev 401)
@@ -7,7 +7,7 @@
holy at wustl.edu
Part of "Tux4Kids" Project
- http://tux4kids.alioth.debian.org/
+ http://www.tux4kids.com/
Subversion repository:
https://svn.debian.alioth.org/tux4kids/tuxmath/
More information about the Tux4kids-commits
mailing list