[Tux4kids-commits] r936 - in tuxtype/trunk: . doc src
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Thu Mar 12 02:43:30 UTC 2009
Author: dbruce-guest
Date: 2009-03-12 02:43:29 +0000 (Thu, 12 Mar 2009)
New Revision: 936
Added:
tuxtype/trunk/Info.plist
tuxtype/trunk/icon.png
Modified:
tuxtype/trunk/Makefile.am
tuxtype/trunk/Makefile.am~
tuxtype/trunk/Makefile.in
tuxtype/trunk/config.guess
tuxtype/trunk/config.h.in~
tuxtype/trunk/config.sub
tuxtype/trunk/doc/ChangeLog
tuxtype/trunk/doc/INSTALL
tuxtype/trunk/doc/README
tuxtype/trunk/src/SDL_extras.c
tuxtype/trunk/tuxtype.desktop
tuxtype/trunk/tuxtype.spec.in
tuxtype/trunk/tuxtype_preview.spec.in
Log:
tweaks of desktop file, specfiles
Added: tuxtype/trunk/Info.plist
===================================================================
--- tuxtype/trunk/Info.plist (rev 0)
+++ tuxtype/trunk/Info.plist 2009-03-12 02:43:29 UTC (rev 936)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>tuxmath</string>
+ <key>CFBundleIconFile</key>
+ <string>tuxtype.icns</string>
+ <key>CFBundleIdentifier</key>
+ <string>application/x-vnd.tuxtype.oxyd</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>TuxType</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>0.80</string>
+ <key>NSMainNibFile</key>
+ <string>SDLMain</string>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+</dict>
+</plist>
Modified: tuxtype/trunk/Makefile.am
===================================================================
--- tuxtype/trunk/Makefile.am 2009-03-11 11:16:48 UTC (rev 935)
+++ tuxtype/trunk/Makefile.am 2009-03-12 02:43:29 UTC (rev 936)
@@ -1,4 +1,4 @@
-# Modified to include support for NSIS Windows installer - David Bruce <dbruce at tampabay.rr.com>
+# Modified to include support for NSIS Windows installer - David Bruce <davidstuartbruce at gmail.com>
SUBDIRS = data \
doc \
@@ -8,7 +8,12 @@
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = tuxtype.spec tuxtype.desktop tuxtype.ico config.rpath
+EXTRA_DIST = tuxtype.spec \
+ tuxtype.desktop \
+ tuxtype.ico \
+ icon.png \
+ Info.plist \
+ config.rpath
datadir = @datadir@
localedir = $(datadir)/locale
Modified: tuxtype/trunk/Makefile.am~
===================================================================
--- tuxtype/trunk/Makefile.am~ 2009-03-11 11:16:48 UTC (rev 935)
+++ tuxtype/trunk/Makefile.am~ 2009-03-12 02:43:29 UTC (rev 936)
@@ -1,14 +1,19 @@
# Modified to include support for NSIS Windows installer - David Bruce <dbruce at tampabay.rr.com>
-SUBDIRS = doc \
+SUBDIRS = data \
+ doc \
intl \
po \
- src \
- data
+ src
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = tuxtype.spec tuxtype.desktop tuxtype.ico config.rpath
+EXTRA_DIST = tuxtype.spec \
+ tuxtype.desktop \
+ tuxtype.ico \
+ icon.png \
+ Info.plist \
+ config.rpath
datadir = @datadir@
localedir = $(datadir)/locale
Modified: tuxtype/trunk/Makefile.in
===================================================================
--- tuxtype/trunk/Makefile.in 2009-03-11 11:16:48 UTC (rev 935)
+++ tuxtype/trunk/Makefile.in 2009-03-12 02:43:29 UTC (rev 936)
@@ -14,7 +14,7 @@
@SET_MAKE@
-# Modified to include support for NSIS Windows installer - David Bruce <dbruce at tampabay.rr.com>
+# Modified to include support for NSIS Windows installer - David Bruce <davidstuartbruce at gmail.com>
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -256,7 +256,13 @@
src
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = tuxtype.spec tuxtype.desktop tuxtype.ico config.rpath
+EXTRA_DIST = tuxtype.spec \
+ tuxtype.desktop \
+ tuxtype.ico \
+ icon.png \
+ Info.plist \
+ config.rpath
+
MAKENSIS = @NSIS@
NSIS_FOUND = @NSIS_FOUND@
NSI_TEMP_INSTALL_DIR = $(abs_top_builddir)/_instw32
Modified: tuxtype/trunk/config.guess
===================================================================
--- tuxtype/trunk/config.guess 2009-03-11 11:16:48 UTC (rev 935)
+++ tuxtype/trunk/config.guess 2009-03-12 02:43:29 UTC (rev 936)
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2008-12-19'
+timestamp='2008-01-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -331,20 +331,7 @@
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- eval $set_cc_for_build
- SUN_ARCH="i386"
- # If there is a compiler, see if it is configured for 64-bit objects.
- # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
- # This test works for both compilers.
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- SUN_ARCH="x86_64"
- fi
- fi
- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
@@ -809,7 +796,7 @@
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
- EM64T | authenticamd | genuineintel)
+ EM64T | authenticamd)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
@@ -948,9 +935,6 @@
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
exit ;;
- padre:Linux:*:*)
- echo sparc-unknown-linux-gnu
- exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -1001,6 +985,9 @@
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
exit ;;
+ coff-i386)
+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ exit ;;
"")
# Either a pre-BFD a.out linker (linux-gnuoldld) or
# one that does not give us useful --help.
@@ -1154,16 +1141,6 @@
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& { echo i486-ncr-sysv4; exit; } ;;
- NCR*:*:4.2:* | MPRAS*:*:4.2:*)
- OS_REL='.3'
- test -r /etc/.relid \
- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
exit ;;
@@ -1239,9 +1216,6 @@
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
echo i586-pc-beos
exit ;;
- BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
- echo i586-pc-haiku
- exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
Modified: tuxtype/trunk/config.h.in~
===================================================================
--- tuxtype/trunk/config.h.in~ 2009-03-11 11:16:48 UTC (rev 935)
+++ tuxtype/trunk/config.h.in~ 2009-03-12 02:43:29 UTC (rev 936)
@@ -155,6 +155,9 @@
/* Define to 1 if you have the <libintl.h> header file. */
#undef HAVE_LIBINTL_H
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
/* Define to 1 if you have the `SDL_image' library (-lSDL_image). */
#undef HAVE_LIBSDL_IMAGE
@@ -436,24 +439,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
@@ -464,17 +477,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/config.sub
===================================================================
--- tuxtype/trunk/config.sub 2009-03-11 11:16:48 UTC (rev 935)
+++ tuxtype/trunk/config.sub 2009-03-12 02:43:29 UTC (rev 936)
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2009-01-19'
+timestamp='2008-01-16'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -122,7 +122,6 @@
case $maybe_os in
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -250,16 +249,13 @@
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep | metag \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
- | mips64octeon | mips64octeonel \
- | mips64orion | mips64orionel \
- | mips64r5900 | mips64r5900el \
| mips64vr | mips64vrel \
+ | mips64orion | mips64orionel \
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
@@ -281,7 +277,7 @@
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
| score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -290,7 +286,7 @@
| v850 | v850e \
| we32k \
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k | z80)
+ | z8k)
basic_machine=$basic_machine-unknown
;;
m6811 | m68hc11 | m6812 | m68hc12)
@@ -333,17 +329,14 @@
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
- | lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
- | mips64octeon-* | mips64octeonel-* \
- | mips64orion-* | mips64orionel-* \
- | mips64r5900-* | mips64r5900el-* \
| mips64vr-* | mips64vrel-* \
+ | mips64orion-* | mips64orionel-* \
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
@@ -365,20 +358,20 @@
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
- | z8k-* | z80-*)
+ | z8k-*)
;;
# Recognize the basic CPU types without company name, with glob match.
xtensa*)
@@ -466,10 +459,6 @@
basic_machine=c90-cray
os=-unicos
;;
- cegcc)
- basic_machine=arm-unknown
- os=-cegcc
- ;;
convex-c1)
basic_machine=c1-convex
os=-bsd
@@ -537,10 +526,6 @@
basic_machine=m88k-motorola
os=-sysv3
;;
- dicos)
- basic_machine=i686-pc
- os=-dicos
- ;;
djgpp)
basic_machine=i586-pc
os=-msdosdjgpp
@@ -1143,10 +1128,6 @@
basic_machine=z8k-unknown
os=-sim
;;
- z80-*-coff)
- basic_machine=z80-unknown
- os=-sim
- ;;
none)
basic_machine=none-none
os=-none
@@ -1185,7 +1166,7 @@
we32k)
basic_machine=we32k-att
;;
- sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1257,7 +1238,6 @@
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1268,7 +1248,7 @@
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
+ | -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1408,9 +1388,6 @@
-zvmoe)
os=-zvmoe
;;
- -dicos*)
- os=-dicos
- ;;
-none)
;;
*)
Modified: tuxtype/trunk/doc/ChangeLog
===================================================================
--- tuxtype/trunk/doc/ChangeLog 2009-03-11 11:16:48 UTC (rev 935)
+++ tuxtype/trunk/doc/ChangeLog 2009-03-12 02:43:29 UTC (rev 936)
@@ -1,6 +1,16 @@
+03 Mar 2009 (svn.debian.org/tux4kids - revision 932)
+Version 1.7.4
+[ David Bruce <davidstuartbruce at gmail.com> ]
+ - Build - configure.ac updated to only link to SDL_ttf when SDL_Pango is
+ unavailable; also added configure option "--without-sdlpango" to facilitate
+ testing of program when SDL_ttf is used.
+
03 Mar 2009 (svn.debian.org/tux4kids - revision 923)
[ David Bruce <davidstuartbruce at gmail.com> ]
- - Text drawing -
+ - Text drawing - encapsulation of all calls to SDL_ttf and SDL_Pango to
+ within SDL_extras.c/.h. The rest of the program no longer "knows" which
+ text library is being used. Now, since SDL_ttf is no longer used at all
+ whenever SDL_Pango is available, we don't need any specific fonts for Linux.
22 Feb 2009 svn revision 903
[ David Bruce <davidstuartbruce at gmail.com> ]
@@ -8,7 +18,7 @@
including removal of remaining incorrect uses of "unsigned char".
- addition of "make dist_with_fonts_bzip2" target to help support OpenSUSE
build service integration.
- - beginning of VERSIOM "1.7.4.preview"
+ - beginning of VERSION "1.7.4.preview"
- cleanup of alphabet.c with addition of pointer safety checks and fix of
"off-by-one" drawing error in fourth row of keyboard hints graphic.
Modified: tuxtype/trunk/doc/INSTALL
===================================================================
--- tuxtype/trunk/doc/INSTALL 2009-03-11 11:16:48 UTC (rev 935)
+++ tuxtype/trunk/doc/INSTALL 2009-03-12 02:43:29 UTC (rev 936)
@@ -1,4 +1,4 @@
-Tux Typing 1.7.3
+Tux Typing 1.7.4
03 Feb 2009
NOTE - this document is reasonably correct but not completely current.
@@ -28,9 +28,14 @@
SDL-1.2.5 http://www.libsdl.org
SDL_image-1.2.3 http://www.libsdl.org/projects/SDL_image
SDL_mixer-1.2.5 http://www.libsdl.org/projects/SDL_mixer
+
+ And either:
SDL_ttf-2.0.5 http://www.libsdl.org/projects/SDL_ttf
+ or
+ SDL_Pango http://sdlpango.sourceforge.net
- SDL_Pango will be used if found
+ SDL_Pango will be used if found as it provides complex rendering needed
+ for many non-Western languages.
Notes:
These libraries in turn have other dependencies (jpeg, tiff, smpeg, ogg,
@@ -59,9 +64,9 @@
the corresponding Makefile.am's. You should not need to do this if you are building from
a tuxtype*.tar.gz (but will need to do this if building from a Subversion checkout).
-Note - you almost certainly want the tarball with the bundled fonts, e.g. tuxtype_w_fonts-1.7.3.tar.gz.
-The tarballs without fonts are for making Debian packages that will be installed by a package
-manager that will take care of installing the needed fonts.
+Note - if you have SDL_Pango available, you can use the package without bundled fonts (e.g.
+tuxtype-1.7.4.tar.gz). The tarball with the bundled fonts, e.g. tuxtype_w_fonts-1.7.4.tar.gz.
+will work fine whether or not SDL_Pango is available. The unused fonts will simply take up about 2.5 MB on your hard drive.
We want this to work for everybody, everywhere, if it doesn't
work for you please contact: tux4kids-tuxtype-dev at lists.alioth.debian.org
Modified: tuxtype/trunk/doc/README
===================================================================
--- tuxtype/trunk/doc/README 2009-03-11 11:16:48 UTC (rev 935)
+++ tuxtype/trunk/doc/README 2009-03-12 02:43:29 UTC (rev 936)
@@ -19,7 +19,7 @@
Additional information on this subject is covered in "HowToTheme.html"
in the "doc/en" directory of this package.
-This is version 1.7.2 of Tux Typing.
+This is version 1.7.4 of Tux Typing.
In Fish Cascade you control Tux as he searches for fish to eat. Fish fall
from the top of the screen. These fish have letters on them. Unforunately
Added: tuxtype/trunk/icon.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/trunk/icon.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: tuxtype/trunk/src/SDL_extras.c
===================================================================
--- tuxtype/trunk/src/SDL_extras.c 2009-03-11 11:16:48 UTC (rev 935)
+++ tuxtype/trunk/src/SDL_extras.c 2009-03-12 02:43:29 UTC (rev 936)
@@ -694,7 +694,7 @@
if (t[0] == '\0')
{
- fprintf(stderr, "BlackOutline(): empty string, returning\n");
+ LOG("BlackOutline(): empty string, returning\n");
return NULL;
}
Modified: tuxtype/trunk/tuxtype.desktop
===================================================================
--- tuxtype/trunk/tuxtype.desktop 2009-03-11 11:16:48 UTC (rev 935)
+++ tuxtype/trunk/tuxtype.desktop 2009-03-12 02:43:29 UTC (rev 936)
@@ -1,6 +1,6 @@
[Desktop Entry]
Name=Tux Typing
-GenericName=Kids game
+GenericName=Educational typing game
GenericName[ru]=Игра для детей
GenericName[tr]=Daktilo Öğretmeni
GenericName[fr]=Jeu pour les enfants
@@ -14,4 +14,4 @@
Terminal=false
Type=Application
StartupNotify=true
-Categories=Education;X-Teaching;
+Categories=Education;Languages;
Modified: tuxtype/trunk/tuxtype.spec.in
===================================================================
--- tuxtype/trunk/tuxtype.spec.in 2009-03-11 11:16:48 UTC (rev 935)
+++ tuxtype/trunk/tuxtype.spec.in 2009-03-12 02:43:29 UTC (rev 936)
@@ -16,65 +16,51 @@
Summary: Typing tutor for children
Url: http://alioth.debian.org/projects/tux4kids/
%define realname @PACKAGE@
-%define progname tuxtype
+%define progname @PACKAGE@
License: GNU General Public License (GPL) v2, Open Font License v1.1, free (BSD-like) license
-Group: Amusements/Games/Action/Other
+Group: Amusements/Teaching/Language
Version: @VERSION@
Release: 1
Vendor: openSUSE-Education
Source: %realname-%version.tar.bz2
-BuildRequires: SDL_image-devel >= 1.2.2
-#BuildRequires: SDL_ttf-devel > 2.0.8
-BuildRequires: SDL-devel
-BuildRequires: SDL_mixer-devel
-BuildRequires: SDL_Pango-devel
+BuildRequires: SDL_image-devel >= 1.2.2
+#BuildRequires: SDL_ttf-devel > 2.0.8
+BuildRequires: SDL-devel
+BuildRequires: SDL_mixer-devel
+BuildRequires: SDL_Pango-devel
BuildRequires: ImageMagick
-%if 0%{?suse_version}
-BuildRequires: update-desktop-files
-BuildRequires: fdupes
-%endif
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+BuildRequires: fdupes
+%endif
-%if 0%{?fedora_version}
-BuildRequires: desktop-file-utils
-%endif
+%if 0%{?fedora_version}
+BuildRequires: desktop-file-utils
+%endif
-%if 0%{?mandriva_version}
-BuildRequires: desktop-file-utils
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
+%if 0%{?mandriva_version}
+BuildRequires: desktop-file-utils
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
%endif
%if 0%{?mandriva_version} >= 2009
BuildRequires: pulseaudio-esound-compat
%endif
-BuildRoot: %{_tmppath}/%{progname}-%{version}-build
+Source0: %realname-%version.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Tux Typing is an educational typing tutor game starring Tux, the Linux
-penguin.
+penguin. It is designed to be entertaining for children, but can be used
+by all ages to improve typing skills. Tux Typing includes two video game-style activities that give practice typing individual characters and words. There
+is also a phrase typing activity that provides practice with phrases and sentences, with on-screen display of accuracy and typing speed.
-In "Fish Cascade" you control Tux as he searches for fish to eat. Fish fall
-from the top of the screen. These fish have letters on them. Unforunately
-for Tux, eating a fish with a letter on it will cause his stomach to
-become ill, so it is up to you to help Tux eat fish! By typing the
-letters, it will cause them to disappear so tux can chow down on the
-fish.
+Tux Typing supports all commonly used desktop platforms, and is packaged with translation files and word lists for many (human) languages. The program is capable of displaying essentially the entire Unicode character set.
-In "Comet Zap" you control Tux as he defends the cities from comets. To
-protect a city from a comet, type the letter on the comet and it will
-cause Tux to destroy it with a laser! (In case you wondered, Comet Zap
-is an adaptation of the *great* math drill game, "Tux, of Math Command").
-
-"Phrase Typing" offers practice typing phrases and sentences, with on-
-screen display of accuracy and typing speed.
-
-"Lessons" is an additional typing activity that we have not yet
-completed. You will find other menu entries for planned features
-that still need to be implemented.
-
Authors:
--------
Current maintainer and programming lead:
@@ -91,60 +77,52 @@
Mobin Mohan <mobinmohan at gmail.com>
+# prep section: ---------------------------------------------------------
+
%prep
%setup -q -n %realname-%version
rm -rf $(find . -type d -name CVS)
rm -rf $(find . -type d -name .svn)
rm -rf $(find . -type d -name .xvpics)
+
+
+# build section: ---------------------------------------------------------
+
%build
-%configure --docdir="%{_defaultdocdir}/%{progname}" --disable-rpath
+%configure --disable-rpath
make %{?jobs:-j %jobs}
-%install
-%if 0%{?suse_version} < 1030
-for i in $(find . -progname Makefile ); do
- sed -i "s#MKDIR_P#mkdir_p#g" $i
-done
-%endif
+# install section: ---------------------------------------------------------
+
+%install
+install -d %buildroot/{%_bindir,%_datadir/pixmaps,%_datadir/applications,%_datadir/%progname,%_defaultdocdir/%progname}
make DESTDIR=%{buildroot} install
-# remove unneeded data
-rm -rf %buildroot/usr/doc/tuxtype
-rm -rf %buildroot%_datadir/tuxtype/{autorun.inf,OFL.txt}
+install -m 644 data/images/icons/icon.png %buildroot%_datadir/pixmaps/%progname.png
-# install desktop file and icon
-mkdir -p %buildroot%_datadir/pixmaps
-convert -scale 48x48 tuxtype.ico %buildroot%_datadir/pixmaps/%progname.png
-rm -rf %buildroot%_datadir/tuxtype/*.ico
-
%if 0%{?suse_version}
-#install -Dm644 %{SOURCE1} %buildroot%_datadir/applications/%progname.desktop
-%suse_update_desktop_file -i %progname Game KidsGame
-# save some discspace using symlinks
+# handle special docdir path
+mv %buildroot/%_datadir/doc/%progname/* %buildroot/%_defaultdocdir/%progname/
+rm -rf %buildroot/%_datadir/doc/%progname
+# install desktop file
+%suse_update_desktop_file -i %progname Education Languages
%fdupes -s %buildroot
%endif
-
%if 0%{?fedora_version}
# install desktop file
desktop-file-install --vendor="%{vendor}" \
--dir=%buildroot/%_datadir/applications \
- tuxtype.desktop
+ %progname.desktop
%endif
-
%if 0%{?mandriva_version}
-#desktop-file-install --vendor="%{vendor}" \
-# --dir=%buildroot/%_datadir/applications \
-install -Dm644 tuxtype.desktop %buildroot/%_datadir/applications/%progname.desktop
+desktop-file-install --vendor="%{vendor}" \
+ --dir=%buildroot/%_datadir/applications \
+ %progname.desktop
%endif
-
-# grmbl....
-#if [ ! -d %buildroot%{_datadir}/fonts/truetype ]; then
-# mkdir -p %buildroot%{_datadir}/fonts/truetype
-# ln -s %{_datadir}/tuxtype/fonts %buildroot%{_datadir}/fonts/truetype/ttf-sil-andika
-#fi
-
+# remove invalid locale directories
+rm -rf %buildroot/%{_datadir}/locale/en@*
%find_lang %progname
%if 0%{?mandriva_version}
@@ -158,27 +136,17 @@
%clean
rm -rf %buildroot
-%files -f %progname.lang
-%defattr(-,root,root)
-#%doc README AUTHORS COPYING ChangeLog TODO
-%dir %_docdir/%{progname}
-%doc %_docdir/%{progname}/*
-%doc data/sounds/README_SOUNDS.TXT
-%doc data/images/README_IMAGES.TXT
-#%if 0%{?fedora_version}
-#%dir %_docdir/%{progname}
-#%doc %_docdir/%{progname}/*
-#%endif
-%{_bindir}/tuxtype
-%dir %_datadir/tuxtype
-#%dir %_datadir/tuxtype/fonts
-#%dir %{_datadir}/fonts/truetype
-#%dir %{_datadir}/fonts/truetype/ttf-sil-andika
-%_datadir/tuxtype/*
-%_datadir/applications/*%progname.desktop
-%_datadir/pixmaps/%progname.png
+# files section: ---------------------------------------------------------
+%files -f %progname.lang
-%changelog
+%defattr(-,root,root)
+%doc %_defaultdocdir/%progname
+%_bindir/*
+%_datadir/pixmaps/*
+%_datadir/applications/*
+%_datadir/%progname
+
+%changelog
Modified: tuxtype/trunk/tuxtype_preview.spec.in
===================================================================
--- tuxtype/trunk/tuxtype_preview.spec.in 2009-03-11 11:16:48 UTC (rev 935)
+++ tuxtype/trunk/tuxtype_preview.spec.in 2009-03-12 02:43:29 UTC (rev 936)
@@ -23,7 +23,7 @@
%define realname @PACKAGE@
%define progname tuxtype
License: GNU General Public License (GPL) v2, Open Font License v1.1, free (BSD-like) license
-Group: Amusements/Games/Action/Other
+Group: Amusements/Teaching/Language
Version: @VERSION@
Release: 1
Vendor: openSUSE-Education
@@ -59,27 +59,12 @@
%description
Tux Typing is an educational typing tutor game starring Tux, the Linux
-penguin.
+penguin. It is designed to be entertaining for children, but can be used
+by all ages to improve typing skills. Tux Typing includes two video game-style activities that give practice typing individual characters and words. There
+is also a phrase typing activity that provides practice with phrases and sentences, with on-screen display of accuracy and typing speed.
-In "Fish Cascade" you control Tux as he searches for fish to eat. Fish fall
-from the top of the screen. These fish have letters on them. Unforunately
-for Tux, eating a fish with a letter on it will cause his stomach to
-become ill, so it is up to you to help Tux eat fish! By typing the
-letters, it will cause them to disappear so tux can chow down on the
-fish.
+Tux Typing supports all commonly used desktop platforms, and is packaged with translation files and word lists for many (human) languages. The program is capable of displaying essentially the entire Unicode character set.
-In "Comet Zap" you control Tux as he defends the cities from comets. To
-protect a city from a comet, type the letter on the comet and it will
-cause Tux to destroy it with a laser! (In case you wondered, Comet Zap
-is an adaptation of the *great* math drill game, "Tux, of Math Command").
-
-"Phrase Typing" offers practice typing phrases and sentences, with on-
-screen display of accuracy and typing speed.
-
-"Lessons" is an additional typing activity that we have not yet
-completed. You will find other menu entries for planned features
-that still need to be implemented.
-
Authors:
--------
Current maintainer and programming lead:
@@ -96,57 +81,52 @@
Mobin Mohan <mobinmohan at gmail.com>
+# prep section: ---------------------------------------------------------
+
%prep
%setup -q -n %realname-%version
+rm -rf $(find . -type d -name CVS)
+rm -rf $(find . -type d -name .svn)
+rm -rf $(find . -type d -name .xvpics)
+
+
+# build section: ---------------------------------------------------------
+
%build
-%configure --docdir="%{_defaultdocdir}/%{progname}" --disable-rpath
+%configure --disable-rpath
make %{?jobs:-j %jobs}
-%install
-%if 0%{?suse_version} < 1030
-for i in $(find . -progname Makefile ); do
- sed -i "s#MKDIR_P#mkdir_p#g" $i
-done
-%endif
+# install section: ---------------------------------------------------------
+
+%install
+install -d %buildroot/{%_bindir,%_datadir/pixmaps,%_datadir/applications,%_datadir/%progname,%_defaultdocdir/%progname}
make DESTDIR=%{buildroot} install
-# remove unneeded data
-rm -rf %buildroot/usr/doc/tuxtype
-rm -rf %buildroot%_datadir/tuxtype/{autorun.inf,OFL.txt}
+install -m 644 data/images/icons/icon.png %buildroot%_datadir/pixmaps/%progname.png
-# install desktop file and icon
-mkdir -p %buildroot%_datadir/pixmaps
-convert -scale 48x48 tuxtype.ico %buildroot%_datadir/pixmaps/%progname.png
-rm -rf %buildroot%_datadir/tuxtype/*.ico
-
%if 0%{?suse_version}
-#install -Dm644 %{SOURCE1} %buildroot%_datadir/applications/%progname.desktop
-%suse_update_desktop_file -i %progname Game KidsGame
-# save some discspace using symlinks
+# handle special docdir path
+mv %buildroot/%_datadir/doc/%progname/* %buildroot/%_defaultdocdir/%progname/
+rm -rf %buildroot/%_datadir/doc/%progname
+# install desktop file
+%suse_update_desktop_file -i %progname Education Languages
%fdupes -s %buildroot
%endif
-
%if 0%{?fedora_version}
# install desktop file
desktop-file-install --vendor="%{vendor}" \
--dir=%buildroot/%_datadir/applications \
- tuxtype.desktop
+ %progname.desktop
%endif
-
%if 0%{?mandriva_version}
-#desktop-file-install --vendor="%{vendor}" \
-# --dir=%buildroot/%_datadir/applications \
-install -Dm644 tuxtype.desktop %buildroot/%_datadir/applications/%progname.desktop
+desktop-file-install --vendor="%{vendor}" \
+ --dir=%buildroot/%_datadir/applications \
+ %progname.desktop
%endif
-
-# grmbl....
-#if [ ! -d %buildroot%{_datadir}/fonts/truetype ]; then
-# mkdir -p %buildroot%{_datadir}/fonts/truetype
-# ln -s %{_datadir}/tuxtype/fonts %buildroot%{_datadir}/fonts/truetype/ttf-sil-andika
-#fi
-
+# remove invalid locale directories
+rm -rf %buildroot/%{_datadir}/locale/en@*
%find_lang %progname
%if 0%{?mandriva_version}
@@ -160,27 +140,17 @@
%clean
rm -rf %buildroot
-%files -f %progname.lang
-%defattr(-,root,root)
-#%doc README AUTHORS COPYING ChangeLog TODO
-%dir %_docdir/%{progname}
-%doc %_docdir/%{progname}/*
-%doc data/sounds/README_SOUNDS.TXT
-%doc data/images/README_IMAGES.TXT
-#%if 0%{?fedora_version}
-#%dir %_docdir/%{progname}
-#%doc %_docdir/%{progname}/*
-#%endif
-%{_bindir}/tuxtype
-%dir %_datadir/tuxtype
-#%dir %_datadir/tuxtype/fonts
-#%dir %{_datadir}/fonts/truetype
-#%dir %{_datadir}/fonts/truetype/ttf-sil-andika
-%_datadir/tuxtype/*
-%_datadir/applications/*%progname.desktop
-%_datadir/pixmaps/%progname.png
+# files section: ---------------------------------------------------------
+%files -f %progname.lang
-%changelog
+%defattr(-,root,root)
+%doc %_defaultdocdir/%progname
+%_bindir/*
+%_datadir/pixmaps/*
+%_datadir/applications/*
+%_datadir/%progname
+
+%changelog
More information about the Tux4kids-commits
mailing list