[Tux4kids-commits] r826 - in tuxtype/trunk: . data/fonts data/scripts data/sounds data/themes/assamese data/themes/lithuanian/images data/words doc doc/en

Wed Jan 7 12:30:16 UTC 2009

Author: dbruce-guest
Date: 2009-01-07 12:30:16 +0000 (Wed, 07 Jan 2009)
New Revision: 826

Modified:
   tuxtype/trunk/ChangeLog
   tuxtype/trunk/ChangeLog~
   tuxtype/trunk/config.h.in
   tuxtype/trunk/config.h.in~
   tuxtype/trunk/data/fonts/Makefile.am
   tuxtype/trunk/data/fonts/Makefile.in
   tuxtype/trunk/data/scripts/Makefile.in
   tuxtype/trunk/data/sounds/Makefile.in
   tuxtype/trunk/data/themes/assamese/Makefile.in
   tuxtype/trunk/data/themes/lithuanian/images/Makefile.in
   tuxtype/trunk/data/words/Makefile.in
   tuxtype/trunk/doc/AUTHORS
   tuxtype/trunk/doc/INSTALL
   tuxtype/trunk/doc/INSTALL-Win32
   tuxtype/trunk/doc/README
   tuxtype/trunk/doc/en/howtotheme.html
Log:
path fix



Modified: tuxtype/trunk/ChangeLog
===================================================================

--- tuxtype/trunk/ChangeLog	2009-01-07 05:15:29 UTC (rev 825)
+++ tuxtype/trunk/ChangeLog	2009-01-07 12:30:16 UTC (rev 826)
@@ -1,3 +1,5 @@
+
+=======
 06 Jan 2009 - svn revision 822
 [ David Bruce <davidstuartbruce at gmail.com> ]
         - Bugfix to prevent BlackOutline() from segfault if passed empty string
@@ -8,6 +10,18 @@
         - Bugfix for path for bundled fonts - caused error when run on non-Debian
           systems.
 
+10 Dec 2008 - svn revision 795
+Version 1.7.0
+[ David Bruce <davidstuartbruce at gmail.com> ]
+        - First release following 2008 Google Summer of Code.
+        - Several major enhancements:
+        - GNU gettext used for internationalization (M. Mohan)
+        - Themes and translations for multiple additional
+          Indic languages (M. Mohan)
+        - Graphical keyboard hint system (Sreyas K.)
+        - Rewritten phrase practice activity (D. Bruce)
+        - Fullscreen mode at native resolution (D. Bruce)
+
 2008-11-22  gettextize  <bug-gnu-gettext at gnu.org>
 
 	* m4/gettext.m4: Upgrade to gettext-0.17.

Modified: tuxtype/trunk/ChangeLog~
===================================================================
--- tuxtype/trunk/ChangeLog~	2009-01-07 05:15:29 UTC (rev 825)
+++ tuxtype/trunk/ChangeLog~	2009-01-07 12:30:16 UTC (rev 826)
@@ -1,12 +1,28 @@
+<<<<<<< .mine
+10 Dec 2008 - svn revision 795
+Version 1.7.0
+[ David Bruce <davidstuartbruce at gmail.com> ]
+        - First release following 2008 Google Summer of Code.
+        - Several major enhancements:
+        - GNU gettext used for internationalization (M. Mohan)
+        - Themes and translations for multiple additional
+          Indic languages (M. Mohan)
+        - Graphical keyboard hint system (Sreyas K.)
+        - Rewritten phrase practice activity (D. Bruce)
+        - Fullscreen mode at native resolution (D. Bruce)
+
+=======
 06 Jan 2009 - svn revision 822
 [ David Bruce <davidstuartbruce at gmail.com> ]
         - Bugfix to prevent BlackOutline() from segfault if passed empty string
+        - incorporation of several small patches from OpenSuse (thanks Lars Vogdt)
 
 05 Jan 2009 - svn revision 821
 [ David Bruce <davidstuartbruce at gmail.com> ]
         - Bugfix for path for bundled fonts - caused error when run on non-Debian
           systems.
 
+>>>>>>> .r825
 2008-11-22  gettextize  <bug-gnu-gettext at gnu.org>
 
 	* m4/gettext.m4: Upgrade to gettext-0.17.

Modified: tuxtype/trunk/config.h.in
===================================================================
--- tuxtype/trunk/config.h.in	2009-01-07 05:15:29 UTC (rev 825)
+++ tuxtype/trunk/config.h.in	2009-01-07 12:30:16 UTC (rev 826)
@@ -433,34 +433,24 @@
    made weak. */
 #undef USE_SOLARIS_THREADS_WEAK
 
-/* Enable extensions on AIX 3, Interix.  */
+/* Define if the Win32 multithreading API can be used. */
+#undef USE_WIN32_THREADS
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to 1 if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
+
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
 
-
-/* Define if the Win32 multithreading API can be used. */
-#undef USE_WIN32_THREADS
-
-/* Version number of package */
-#undef VERSION
-
 /* Define to 1 if on MINIX. */
 #undef _MINIX
 
@@ -471,6 +461,17 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
+/* Enable extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 

Modified: tuxtype/trunk/config.h.in~
===================================================================
--- tuxtype/trunk/config.h.in~	2009-01-07 05:15:29 UTC (rev 825)
+++ tuxtype/trunk/config.h.in~	2009-01-07 12:30:16 UTC (rev 826)
@@ -433,24 +433,34 @@
    made weak. */
 #undef USE_SOLARIS_THREADS_WEAK
 
-/* Define if the Win32 multithreading API can be used. */
-#undef USE_WIN32_THREADS
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
+/* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
 
+
+/* Define if the Win32 multithreading API can be used. */
+#undef USE_WIN32_THREADS
+
+/* Version number of package */
+#undef VERSION
+
 /* Define to 1 if on MINIX. */
 #undef _MINIX
 
@@ -461,17 +471,6 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
-/* Enable extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 

Modified: tuxtype/trunk/data/fonts/Makefile.am
===================================================================
--- tuxtype/trunk/data/fonts/Makefile.am	2009-01-07 05:15:29 UTC (rev 825)
+++ tuxtype/trunk/data/fonts/Makefile.am	2009-01-07 12:30:16 UTC (rev 826)
@@ -16,7 +16,7 @@
 ## included (depending if package built with "make dist" or "make dist_with_fonts"
 ## 'fontsdir' is where the fonts are installed.
 
-fontsdir = $(pkgdatadir)/data/fonts
+fontsdir = $(pkgdatadir)/fonts
 
 install-data-local:
 	$(MKDIR_P) $(DESTDIR)$(fontsdir)

Modified: tuxtype/trunk/data/fonts/Makefile.in
===================================================================
--- tuxtype/trunk/data/fonts/Makefile.in	2009-01-07 05:15:29 UTC (rev 825)
+++ tuxtype/trunk/data/fonts/Makefile.in	2009-01-07 12:30:16 UTC (rev 826)
@@ -213,11 +213,10 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 EXTRA_DIST = $(dist_fonts)
-fontsdir = $(pkgdatadir)/data/fonts
+fontsdir = $(pkgdatadir)/fonts
 all: all-am
 
 .SUFFIXES:

Modified: tuxtype/trunk/data/scripts/Makefile.in
===================================================================
--- tuxtype/trunk/data/scripts/Makefile.in	2009-01-07 05:15:29 UTC (rev 825)
+++ tuxtype/trunk/data/scripts/Makefile.in	2009-01-07 12:30:16 UTC (rev 826)
@@ -224,10 +224,9 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-scriptsdir = $(pkgdatadir)/data/scripts
+scriptsdir = $(pkgdatadir)/scripts
 dist_scripts_DATA = projectInfo.xml \
   cascade.xml \
   laser.xml \

Modified: tuxtype/trunk/data/sounds/Makefile.in
===================================================================
--- tuxtype/trunk/data/sounds/Makefile.in	2009-01-07 05:15:29 UTC (rev 825)
+++ tuxtype/trunk/data/sounds/Makefile.in	2009-01-07 12:30:16 UTC (rev 826)
@@ -224,10 +224,9 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-soundsdir = $(pkgdatadir)/data/sounds
+soundsdir = $(pkgdatadir)/sounds
 dist_sounds_DATA = tuxi.ogg \
   alarm.wav \
   bite.wav \

Modified: tuxtype/trunk/data/themes/assamese/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/assamese/Makefile.in	2009-01-07 05:15:29 UTC (rev 825)
+++ tuxtype/trunk/data/themes/assamese/Makefile.in	2009-01-07 12:30:16 UTC (rev 826)
@@ -236,11 +236,10 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = words 
-themes_assamesedir = $(pkgdatadir)/data/themes/assamese
+themes_assamesedir = $(pkgdatadir)/themes/assamese
 dist_themes_assamese_DATA = keyboard.lst \
   alphabet.txt \
   settings.txt

Modified: tuxtype/trunk/data/themes/lithuanian/images/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/lithuanian/images/Makefile.in	2009-01-07 05:15:29 UTC (rev 825)
+++ tuxtype/trunk/data/themes/lithuanian/images/Makefile.in	2009-01-07 12:30:16 UTC (rev 826)
@@ -225,7 +225,6 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = status

Modified: tuxtype/trunk/data/words/Makefile.in
===================================================================
--- tuxtype/trunk/data/words/Makefile.in	2009-01-07 05:15:29 UTC (rev 825)
+++ tuxtype/trunk/data/words/Makefile.in	2009-01-07 12:30:16 UTC (rev 826)
@@ -224,10 +224,9 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-wordsdir = $(pkgdatadir)/data/words
+wordsdir = $(pkgdatadir)/words
 dist_words_DATA = alphabet.txt \
   animals.txt \
   astronomy.txt \

Modified: tuxtype/trunk/doc/AUTHORS
===================================================================
--- tuxtype/trunk/doc/AUTHORS	2009-01-07 05:15:29 UTC (rev 825)
+++ tuxtype/trunk/doc/AUTHORS	2009-01-07 12:30:16 UTC (rev 826)
@@ -23,11 +23,13 @@
 ------------------
 Holger Levsen <holger at debian.org> - (Debian packager, project maintainer)
 David Bruce <davidstuartbruce at gmail.com> - (Windows crossbuild using Linux host)
+Alex Shorthouse <ashorthouse at rsd13.org>  - (more recent Mac OSX port)
+
+(previous packagers:)
 David Marshman <marshy at silvan.demon.co.uk> - (BeOS port/packages)
 Calvin Arndt <calarndt at yahoo.com> - (Red Hat 7.1+ RPMs)
 Olivier Dagenais <olivier_dagenais at canada.com> - (Windows port/packages)
 Jesse Andrews <jdandr2 at uky.edu> - (Mac OS port)
-Alex Shorthouse <ashorthouse at rsd13.org>  - (more recent Mac OSX port)
 
 Special thanks to:
 ------------------

Modified: tuxtype/trunk/doc/INSTALL
===================================================================
--- tuxtype/trunk/doc/INSTALL	2009-01-07 05:15:29 UTC (rev 825)
+++ tuxtype/trunk/doc/INSTALL	2009-01-07 12:30:16 UTC (rev 826)
@@ -1,3 +1,24 @@
+Tux Typing 1.7.0
+December 10, 2008
+
+NOTE - this document is reasonably correct but not completely current.
+It will updated as the maintainer's time allows. For GNU/Linux users, you
+need the "*dev" files for the SDL libs listed below, and should have the
+dev file for SDL_Pango if you want to display non-Western text.  TuxType
+will build successfully, but without SDL_Pango support, if this header/lib
+is not found.
+
+Most GNU/Linux users can install Tux Typing with their distribution's 
+package manager (such as apt or yum).  To build from source, you can grab
+the tuxtype_w_fonts*tar.gz, untar it, and build with "./configure; make;
+make install".  You do not need Autotools unless you are building from
+a Subversion repository checkout.  MacOSX users and Windows users can
+install with very user-friendly binary installer packages - DSB.
+
+The current web site is http://www.tux4kids.com.
+The developer mailing list is tux4kids-tuxtype-dev at lists.alioth.debian.org.
+Feel free to email with any feedback or questions. 
+
 Quick Installation
 ==================
 

Modified: tuxtype/trunk/doc/INSTALL-Win32
===================================================================
--- tuxtype/trunk/doc/INSTALL-Win32	2009-01-07 05:15:29 UTC (rev 825)
+++ tuxtype/trunk/doc/INSTALL-Win32	2009-01-07 12:30:16 UTC (rev 826)
@@ -1,13 +1,16 @@
 Tux Typing for Windows
 ----------------------
 
-Updated Aug 25 2007
+Updated Dec 10 2008
 
 2006-present Lead Developer:
-	David Bruce <dbruce at tampabay.rr.com>
+	David Bruce <davidstuartbruce at gmail.com>
 
 Previous Project Manager:
 	Sam Hart <hart at geekcomix.com>
+
+*** See AUTHORS for more complete list of contributors
+
 Developers:
 	Jacob Greig <bombastic at firstlinux.net>
 	Jesse Andrews <jdandr2 at sheffield.cslab.uky.edu>
@@ -19,8 +22,13 @@
 
 To install the binary package for Tux Typing for Windows:
 
-1. Run the nsis installer file (e.g. tuxtype-1.5.11-win32-installer.exe)
+1. Run the nsis installer file (e.g. tuxtype-1.7.10-win32-installer.exe)
 2. Click to accept the terms of the GPL
+(you actually have the legal right to install and run the program
+irrespective of what you think of the GPL, but the NSIS installer
+program needs a click to proceed with installation.  The GPL covers
+copying, not use.  You no more need a license to simply *use* software
+than you need a license to read a book or newspaper!).
 3. Click OK to install in default path (C:\Program Files\TuxType) or
 select alternate location (perhaps if you are logged in as a user
 without privileges to write to C:\Program Files).

Modified: tuxtype/trunk/doc/README
===================================================================
--- tuxtype/trunk/doc/README	2009-01-07 05:15:29 UTC (rev 825)
+++ tuxtype/trunk/doc/README	2009-01-07 12:30:16 UTC (rev 826)
@@ -1,3 +1,7 @@
+NOTE - this document is reasonably correct but not completely current.
+It will updated as the maintainer's time allows - DSB
+
+
 Tux Typing:
 An Educational Typing Tutor Game Starring Tux, the Linux Penguin
 ----------------------------------------------------------------
@@ -11,7 +15,7 @@
     <tux4kids-tuxtype-dev at lists.alioth.debian.org>
 
     Additional information on this subject is covered in "HowToTheme.html"
-    in the "docs" directory of this package.
+    in the "doc/en" directory of this package.
 
 This is version 1.7.0 of Tux Typing.
 
@@ -44,5 +48,8 @@
 
 Enjoy!
 
--Jesse Andrews -- jdandr2 at uky.edu
- http://tux4kids.net/~jdandr2
+David Bruce
+davidstuartbruce at gmail.com
+
+(previous maintainer -Jesse Andrews -- jdandr2 at uky.edu
+ http://tux4kids.net/~jdandr2)

Modified: tuxtype/trunk/doc/en/howtotheme.html
===================================================================
--- tuxtype/trunk/doc/en/howtotheme.html	2009-01-07 05:15:29 UTC (rev 825)
+++ tuxtype/trunk/doc/en/howtotheme.html	2009-01-07 12:30:16 UTC (rev 826)
@@ -6,6 +6,8 @@
 </head>
 <body bgcolor="#ffffff">
 <h2>Theming in Tux Typing 1.5.13</h2>
+<p><i><b>NOTE (Dec 10, 2008) - this document is not very current. Most importantly, native language support now uses the standard GNU gettext libraries.  Also, font selection has been automated by use of SDL_Pango on platforms where is available (GNU/Linux, at this time).  The handling of word lists and custom images is unchanged.  This document will updated as the maintainer's time allows - DSB</i><b></p>
+
 <p>A "Theme" is a method to change the data which Tuxtyping uses.  While this could be used to change the game about Tux and fish, to a game about a Cat and mice, more likely you are interested in making Tuxtyping work in another language. (if you are intersted in creating a new graphical theme like "Racecars" or ... that is cool too, but if things don't act right, please <a href="http://tux4kids.alioth.debian.org">contact us</a>).
 <p>I will walk through how I created the "French" theme in boxes in this text.
 <h3>Difference to Tuxtyping 1.0</h3>


