[Tux4kids-commits] r212 - in tuxmath/trunk: . data/images data/images/tux docs

Fri Aug 24 01:39:50 UTC 2007

Author: dbruce-guest
Date: 2007-08-24 01:39:50 +0000 (Fri, 24 Aug 2007)
New Revision: 212

Modified:
   tuxmath/trunk/Makefile.am
   tuxmath/trunk/configure
   tuxmath/trunk/configure.in
   tuxmath/trunk/data/images/Makefile.am
   tuxmath/trunk/data/images/tux/Makefile.am
   tuxmath/trunk/docs/changelog
Log:
fixed bug leading to missing data files


Modified: tuxmath/trunk/Makefile.am
===================================================================

--- tuxmath/trunk/Makefile.am	2007-08-22 01:22:12 UTC (rev 211)
+++ tuxmath/trunk/Makefile.am	2007-08-24 01:39:50 UTC (rev 212)
@@ -42,7 +42,7 @@
 	-chmod -R a+w $(DESTDIR)$(prefix)/share/$(PACKAGE);
 	-rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE);
 	-for i in *.po; do langcode=$$(echo $$i | sed 's/\.po//'); \
-	rm $(DESTDIR)/$(localedir)/$$langcode/LC_MESSAGES/tuxmath.mo $$langcode.po; \
+	rm $(DESTDIR)/$(localedir)/$$langcode/LC_MESSAGES/tuxmath.mo; \
 	done;
 
 nsis: install-nsi-local

Modified: tuxmath/trunk/configure
===================================================================
--- tuxmath/trunk/configure	2007-08-22 01:22:12 UTC (rev 211)
+++ tuxmath/trunk/configure	2007-08-24 01:39:50 UTC (rev 212)
@@ -1,7 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.61 for tuxmath 1.5.3.
 #
+# Report bugs to <tuxmath-devel at lists.sourceforge.net>.
+#
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -570,13 +572,12 @@
 SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+PACKAGE_NAME='tuxmath'
+PACKAGE_TARNAME='tuxmath'
+PACKAGE_VERSION='1.5.3'
+PACKAGE_STRING='tuxmath 1.5.3'
+PACKAGE_BUGREPORT='tuxmath-devel at lists.sourceforge.net'
 
-ac_unique_file="src/tuxmath.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -773,7 +774,7 @@
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
@@ -1237,7 +1238,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures tuxmath 1.5.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1285,7 +1286,7 @@
   --infodir=DIR          info documentation [DATAROOTDIR/info]
   --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/tuxmath]
   --htmldir=DIR          html documentation [DOCDIR]
   --dvidir=DIR           dvi documentation [DOCDIR]
   --pdfdir=DIR           pdf documentation [DOCDIR]
@@ -1307,7 +1308,9 @@
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of tuxmath 1.5.3:";;
+   esac
   cat <<\_ACEOF
 
 Optional Features:
@@ -1344,6 +1347,7 @@
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
+Report bugs to <tuxmath-devel at lists.sourceforge.net>.
 _ACEOF
 ac_status=$?
 fi
@@ -1404,7 +1408,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-configure
+tuxmath configure 1.5.3
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1418,7 +1422,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
+It was created by tuxmath $as_me 1.5.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1756,6 +1760,14 @@
 
 
 
+
+
+
+
+
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -1763,6 +1775,8 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+
+#AC_PREREQ(2.59)
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   if test -f "$ac_dir/install-sh"; then
@@ -2227,7 +2241,7 @@
 
 # Define the identity of the package.
  PACKAGE=tuxmath
- VERSION=1.5.2
+ VERSION=1.5.3
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5083,7 +5097,12 @@
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
+    ( cat <<\_ASBOX
+## -------------------------------------------------- ##
+## Report this to tuxmath-devel at lists.sourceforge.net ##
+## -------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
 { echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -6139,7 +6158,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by $as_me, which was
+This file was extended by tuxmath $as_me 1.5.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6192,7 +6211,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-config.status
+tuxmath config.status 1.5.3
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

Modified: tuxmath/trunk/configure.in
===================================================================
--- tuxmath/trunk/configure.in	2007-08-22 01:22:12 UTC (rev 211)
+++ tuxmath/trunk/configure.in	2007-08-24 01:39:50 UTC (rev 212)
@@ -1,12 +1,12 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
+AC_INIT(tuxmath, 1.5.3, tuxmath-devel at lists.sourceforge.net)
 
 #AC_PREREQ(2.59)
-AC_INIT(src/tuxmath.c)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-AM_INIT_AUTOMAKE(tuxmath, 1.5.2)
+AM_INIT_AUTOMAKE(tuxmath, 1.5.3)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 

Modified: tuxmath/trunk/data/images/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/Makefile.am	2007-08-22 01:22:12 UTC (rev 211)
+++ tuxmath/trunk/data/images/Makefile.am	2007-08-24 01:39:50 UTC (rev 212)
@@ -1,5 +1,9 @@
 ## Makefile.am for tuxmath data/images:
 ## Process with AutoMake:
+EXTRA_DIST = icon.png	\
+	icon.xpm	\
+	tuxmath.icns	\
+	tuxmath.ico
 
 SUBDIRS = backgrounds	\
 	cities		\

Modified: tuxmath/trunk/data/images/tux/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/tux/Makefile.am	2007-08-22 01:22:12 UTC (rev 211)
+++ tuxmath/trunk/data/images/tux/Makefile.am	2007-08-24 01:39:50 UTC (rev 212)
@@ -1,7 +1,10 @@
 ## Makefile.am for tuxmath data/images/tux:
 ## Process with AutoMake:
 
-EXTRA_DIST = tux-console1.png \
+EXTRA_DIST = console.png \
+	console_led.png	\
+	console_bash.png	\
+	tux-console1.png \
 	tux-console2.png	\
 	tux-console3.png	\
 	tux-console4.png	\

Modified: tuxmath/trunk/docs/changelog
===================================================================
--- tuxmath/trunk/docs/changelog	2007-08-22 01:22:12 UTC (rev 211)
+++ tuxmath/trunk/docs/changelog	2007-08-24 01:39:50 UTC (rev 212)
@@ -1,13 +1,23 @@
 changelog for "tuxmath"
 
+2007.Aug.23 (svn.debian.org/tux4kids - revision 212)
+  Version 1.5.3
+
+  Build:
+    * Fixes in images/Makefile.am and image/tux/Makefile.am - some
+      files had been left off EXTRA_DIST list leading to incomplete
+      installation with 1.5.2 tar.gz.
+
+      David Bruce <dbruce at tampabay.rr.com>
+
 2007.Aug.21 (svn.debian.org/tux4kids - revision 211)
   Version 1.5.2
 
   Build:
     * Doc updates
     * Fixes in top-level Makefile.am - "make distcheck" now
-      succeeds without errors, "make uninstall" removes data and *.po
-      files proplerly.
+      succeeds without errors, "make uninstall" removes data and *.mo
+      files properly.
 
       David Bruce <dbruce at tampabay.rr.com>
 
@@ -16,7 +26,7 @@
   Game:
     * Fix audio system: clean up properly on exit, more robust handling
       of the availability of audio hardware, respect --nosound command line
-      paramater setting.
+      parameter setting.
     * Got demo mode working again
   Options:
     * Fix memory leak in parsing options files


