Skip to content

Commit 8ef9600

Browse files
author
David Bruce
committed
tweaks of desktop file, specfiles
git-svn-id: svn://svn.debian.org/svn/tux4kids/tuxtype/trunk@936 47d30e19-490b-0410-9d18-e851f4e465b3
1 parent 57f2aa6 commit 8ef9600

File tree

15 files changed

+221
-271
lines changed

15 files changed

+221
-271
lines changed

‎Info.plist‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>English</string>
7+
<key>CFBundleExecutable</key>
8+
<string>tuxmath</string>
9+
<key>CFBundleIconFile</key>
10+
<string>tuxtype.icns</string>
11+
<key>CFBundleIdentifier</key>
12+
<string>application/x-vnd.tuxtype.oxyd</string>
13+
<key>CFBundleInfoDictionaryVersion</key>
14+
<string>6.0</string>
15+
<key>CFBundleName</key>
16+
<string>TuxType</string>
17+
<key>CFBundlePackageType</key>
18+
<string>APPL</string>
19+
<key>CFBundleSignature</key>
20+
<string>????</string>
21+
<key>CFBundleVersion</key>
22+
<string>0.80</string>
23+
<key>NSMainNibFile</key>
24+
<string>SDLMain</string>
25+
<key>NSPrincipalClass</key>
26+
<string>NSApplication</string>
27+
</dict>
28+
</plist>

‎Makefile.am‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Modified to include support for NSIS Windows installer - David Bruce <[email protected].com>
1+
# Modified to include support for NSIS Windows installer - David Bruce <davidstuartbruce@gmail.com>
22

33
SUBDIRS = data \
44
doc \
@@ -8,7 +8,12 @@ SUBDIRS = data \
88

99
ACLOCAL_AMFLAGS = -I m4
1010

11-
EXTRA_DIST = tuxtype.spec tuxtype.desktop tuxtype.ico config.rpath
11+
EXTRA_DIST = tuxtype.spec \
12+
tuxtype.desktop \
13+
tuxtype.ico \
14+
icon.png \
15+
Info.plist \
16+
config.rpath
1217
datadir = @datadir@
1318
localedir = $(datadir)/locale
1419

‎Makefile.am~‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
# Modified to include support for NSIS Windows installer - David Bruce <[email protected]>
22

3-
SUBDIRS = doc \
3+
SUBDIRS = data \
4+
doc \
45
intl \
56
po \
6-
src \
7-
data
7+
src
88

99
ACLOCAL_AMFLAGS = -I m4
1010

11-
EXTRA_DIST = tuxtype.spec tuxtype.desktop tuxtype.ico config.rpath
11+
EXTRA_DIST = tuxtype.spec \
12+
tuxtype.desktop \
13+
tuxtype.ico \
14+
icon.png \
15+
Info.plist \
16+
config.rpath
1217
datadir = @datadir@
1318
localedir = $(datadir)/locale
1419

‎Makefile.in‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
@SET_MAKE@
1616

17-
# Modified to include support for NSIS Windows installer - David Bruce <[email protected].com>
17+
# Modified to include support for NSIS Windows installer - David Bruce <davidstuartbruce@gmail.com>
1818
VPATH = @srcdir@
1919
pkgdatadir = $(datadir)/@PACKAGE@
2020
pkglibdir = $(libdir)/@PACKAGE@
@@ -256,7 +256,13 @@ SUBDIRS = data \
256256
src
257257

258258
ACLOCAL_AMFLAGS = -I m4
259-
EXTRA_DIST = tuxtype.spec tuxtype.desktop tuxtype.ico config.rpath
259+
EXTRA_DIST = tuxtype.spec \
260+
tuxtype.desktop \
261+
tuxtype.ico \
262+
icon.png \
263+
Info.plist \
264+
config.rpath
265+
260266
MAKENSIS = @NSIS@
261267
NSIS_FOUND = @NSIS_FOUND@
262268
NSI_TEMP_INSTALL_DIR = $(abs_top_builddir)/_instw32

‎config.guess‎

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
55
# Free Software Foundation, Inc.
66

7-
timestamp='2008-12-19'
7+
timestamp='2008-01-23'
88

99
# This file is free software; you can redistribute it and/or modify it
1010
# under the terms of the GNU General Public License as published by
@@ -331,20 +331,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
331331
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
332332
exit ;;
333333
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
334-
eval $set_cc_for_build
335-
SUN_ARCH="i386"
336-
# If there is a compiler, see if it is configured for 64-bit objects.
337-
# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
338-
# This test works for both compilers.
339-
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
340-
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
341-
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
342-
grep IS_64BIT_ARCH >/dev/null
343-
then
344-
SUN_ARCH="x86_64"
345-
fi
346-
fi
347-
echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
334+
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
348335
exit ;;
349336
sun4*:SunOS:6*:*)
350337
# According to config.sub, this is the proper way to canonicalize
@@ -809,7 +796,7 @@ EOF
809796
x86)
810797
echo i586-pc-interix${UNAME_RELEASE}
811798
exit ;;
812-
EM64T | authenticamd | genuineintel)
799+
EM64T | authenticamd)
813800
echo x86_64-unknown-interix${UNAME_RELEASE}
814801
exit ;;
815802
IA64)
@@ -948,9 +935,6 @@ EOF
948935
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
949936
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
950937
exit ;;
951-
padre:Linux:*:*)
952-
echo sparc-unknown-linux-gnu
953-
exit ;;
954938
parisc:Linux:*:* | hppa:Linux:*:*)
955939
# Look for CPU level
956940
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -1001,6 +985,9 @@ EOF
1001985
a.out-i386-linux)
1002986
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
1003987
exit ;;
988+
coff-i386)
989+
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
990+
exit ;;
1004991
"")
1005992
# Either a pre-BFD a.out linker (linux-gnuoldld) or
1006993
# one that does not give us useful --help.
@@ -1154,16 +1141,6 @@ EOF
11541141
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
11551142
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
11561143
&& { echo i486-ncr-sysv4; exit; } ;;
1157-
NCR*:*:4.2:* | MPRAS*:*:4.2:*)
1158-
OS_REL='.3'
1159-
test -r /etc/.relid \
1160-
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1161-
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1162-
&& { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1163-
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1164-
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; }
1165-
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
1166-
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
11671144
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
11681145
echo m68k-unknown-lynxos${UNAME_RELEASE}
11691146
exit ;;
@@ -1239,9 +1216,6 @@ EOF
12391216
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
12401217
echo i586-pc-beos
12411218
exit ;;
1242-
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
1243-
echo i586-pc-haiku
1244-
exit ;;
12451219
SX-4:SUPER-UX:*:*)
12461220
echo sx4-nec-superux${UNAME_RELEASE}
12471221
exit ;;

‎config.h.in~‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@
155155
/* Define to 1 if you have the <libintl.h> header file. */
156156
#undef HAVE_LIBINTL_H
157157

158+
/* Define to 1 if you have the `m' library (-lm). */
159+
#undef HAVE_LIBM
160+
158161
/* Define to 1 if you have the `SDL_image' library (-lSDL_image). */
159162
#undef HAVE_LIBSDL_IMAGE
160163

@@ -436,23 +439,33 @@
436439
made weak. */
437440
#undef USE_SOLARIS_THREADS_WEAK
438441

439-
/* Define if the Win32 multithreading API can be used. */
440-
#undef USE_WIN32_THREADS
441-
442-
/* Version number of package */
443-
#undef VERSION
444-
445-
/* Define to 1 if on AIX 3.
446-
System headers sometimes define this.
447-
We just want to avoid a redefinition error message. */
442+
/* Enable extensions on AIX 3, Interix. */
448443
#ifndef _ALL_SOURCE
449444
# undef _ALL_SOURCE
450445
#endif
451-
452446
/* Enable GNU extensions on systems that have them. */
453447
#ifndef _GNU_SOURCE
454448
# undef _GNU_SOURCE
455449
#endif
450+
/* Enable threading extensions on Solaris. */
451+
#ifndef _POSIX_PTHREAD_SEMANTICS
452+
# undef _POSIX_PTHREAD_SEMANTICS
453+
#endif
454+
/* Enable extensions on HP NonStop. */
455+
#ifndef _TANDEM_SOURCE
456+
# undef _TANDEM_SOURCE
457+
#endif
458+
/* Enable general extensions on Solaris. */
459+
#ifndef __EXTENSIONS__
460+
# undef __EXTENSIONS__
461+
#endif
462+
463+
464+
/* Define if the Win32 multithreading API can be used. */
465+
#undef USE_WIN32_THREADS
466+
467+
/* Version number of package */
468+
#undef VERSION
456469

457470
/* Define to 1 if on MINIX. */
458471
#undef _MINIX
@@ -464,17 +477,6 @@
464477
/* Define to 1 if you need to in order for `stat' and other things to work. */
465478
#undef _POSIX_SOURCE
466479

467-
/* Enable extensions on Solaris. */
468-
#ifndef __EXTENSIONS__
469-
# undef __EXTENSIONS__
470-
#endif
471-
#ifndef _POSIX_PTHREAD_SEMANTICS
472-
# undef _POSIX_PTHREAD_SEMANTICS
473-
#endif
474-
#ifndef _TANDEM_SOURCE
475-
# undef _TANDEM_SOURCE
476-
#endif
477-
478480
/* Define to empty if `const' does not conform to ANSI C. */
479481
#undef const
480482

0 commit comments

Comments
 (0)