On Thu, Mar 10, 2005 at 08:31:03PM +0100, Peter De Wachter wrote:
> This package contains the font robbo.ttf, which includes the following
> copyright statement: "Copyright 1990-1996 Bitstream Inc. All rights
> reserved."
>
> Without a free license Debian cannot distribute this font, and thus it
> should be removed.
>
> To get a replacement font, you can depend on ttf-bitstream-vera,
> ttf-freefont, or one of the other free fonts packaged in Debian.
I've prepared an example patch for this (attached). The patch is not
fully tested with regard to time-skew issues due to the Makefile.*
changes.
The fact that you also need to prepare a orig.tar.gz without the font
file is of course also not reflected in the patch.
Gruesse,
--
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/
diff -Nur gnurobbo-0.57.bak/config.guess gnurobbo-0.57.dfsg/config.guess
--- gnurobbo-0.57.bak/config.guess 2005-03-12 23:54:07.000000000 +0100
+++ gnurobbo-0.57.dfsg/config.guess 2005-03-13 00:13:38.989965768 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-timestamp='2004-03-12'
+timestamp='2004-11-12'
# 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
@@ -53,7 +53,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -203,15 +203,15 @@
amiga:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
- arc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
cats:OpenBSD:*:*)
echo arm-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
hp300:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
+ luna88k:OpenBSD:*:*)
+ echo m88k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
mac68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
@@ -227,21 +227,12 @@
mvmeppc:OpenBSD:*:*)
echo powerpc-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
- pegasos:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- pmax:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
sgi:OpenBSD:*:*)
- echo mipseb-unknown-openbsd${UNAME_RELEASE}
+ echo mips64-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
sun3:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
- wgrisc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
*:OpenBSD:*:*)
echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
@@ -307,9 +298,6 @@
# 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e
's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
exit 0 ;;
- Alpha*:OpenVMS:*:*)
- echo alpha-hp-vms
- exit 0 ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
@@ -331,6 +319,9 @@
*:OS/390:*:*)
echo i370-ibm-openedition
exit 0 ;;
+ *:z/VM:*:*)
+ echo s390-ibm-zvmoe
+ exit 0 ;;
*:OS400:*:*)
echo powerpc-ibm-os400
exit 0 ;;
@@ -354,7 +345,7 @@
DRS?6000:unix:4.0:6*)
echo sparc-icl-nx6
exit 0 ;;
- DRS?6000:UNIX_SV:4.2*:7*)
+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7 && exit 0 ;;
esac ;;
@@ -764,7 +755,7 @@
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
*:UNICOS/mp:*:*)
- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
'abcdefghijklmnopqrstuvwxyz'`
@@ -787,21 +778,7 @@
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit 0 ;;
*:FreeBSD:*:*)
- # Determine whether the default compiler uses glibc.
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <features.h>
- #if __GLIBC__ >= 2
- LIBC=gnu
- #else
- LIBC=
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- # GNU/KFreeBSD systems have a "k" prefix to indicate we are using
- # FreeBSD's kernel, but not the complete OS.
- case ${LIBC} in gnu) kernel_only='k' ;; esac
- echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo
${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'`
exit 0 ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
@@ -850,6 +827,12 @@
cris:Linux:*:*)
echo cris-axis-linux-gnu
exit 0 ;;
+ crisv32:Linux:*:*)
+ echo crisv32-axis-linux-gnu
+ exit 0 ;;
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit 0 ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
@@ -1096,9 +1079,9 @@
M680?0:D-NIX:5.3:*)
echo m68k-diab-dnix
exit 0 ;;
- M68*:*:R3V[567]*:*)
+ M68*:*:R3V[5678]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 |
3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 |
SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 |
3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 |
SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1196,9 +1179,10 @@
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
exit 0 ;;
*:Darwin:*:*)
- case `uname -p` in
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
*86) UNAME_PROCESSOR=i686 ;;
- powerpc) UNAME_PROCESSOR=powerpc ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit 0 ;;
@@ -1260,6 +1244,16 @@
*:DragonFly:*:*)
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'`
exit 0 ;;
+ *:*VMS:*:*)
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ case "${UNAME_MACHINE}" in
+ A*) echo alpha-dec-vms && exit 0 ;;
+ I*) echo ia64-dec-vms && exit 0 ;;
+ V*) echo vax-dec-vms && exit 0 ;;
+ esac ;;
+ *:XENIX:*:SysV)
+ echo i386-pc-xenix
+ exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
diff -Nur gnurobbo-0.57.bak/config.sub gnurobbo-0.57.dfsg/config.sub
--- gnurobbo-0.57.bak/config.sub 2005-03-12 23:54:07.000000000 +0100
+++ gnurobbo-0.57.dfsg/config.sub 2005-03-13 00:13:38.987966072 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-timestamp='2004-03-12'
+timestamp='2004-11-30'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -70,7 +70,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -145,7 +145,7 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis)
+ -apple | -axis | -knuth | -cray)
os=
basic_machine=$1
;;
@@ -267,7 +267,7 @@
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xstormy16 | xtensa \
+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -300,7 +300,7 @@
| avr-* \
| bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- | clipper-* | cydra-* \
+ | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
@@ -326,8 +326,9 @@
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
+ | mmix-* \
| msp430-* \
- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
@@ -342,8 +343,8 @@
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
- | xtensa-* \
+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
;;
@@ -445,6 +446,10 @@
basic_machine=j90-cray
os=-unicos
;;
+ craynv)
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
cr16c)
basic_machine=cr16c-unknown
os=-elf
@@ -452,6 +457,9 @@
crds | unos)
basic_machine=m68k-crds
;;
+ crisv32 | crisv32-* | etraxfs*)
+ basic_machine=crisv32-axis
+ ;;
cris | cris-* | etrax*)
basic_machine=cris-axis
;;
@@ -481,6 +489,10 @@
basic_machine=m88k-motorola
os=-sysv3
;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+ ;;
dpx20 | dpx20-*)
basic_machine=rs6000-bull
os=-bosx
@@ -659,10 +671,6 @@
mips3*)
basic_machine=`echo $basic_machine | sed -e
's/mips3/mips64/'`-unknown
;;
- mmix*)
- basic_machine=mmix-knuth
- os=-mmixware
- ;;
monitor)
basic_machine=m68k-rom68k
os=-coff
@@ -743,10 +751,6 @@
np1)
basic_machine=np1-gould
;;
- nv1)
- basic_machine=nv1-cray
- os=-unicosmp
- ;;
nsr-tandem)
basic_machine=nsr-tandem
;;
@@ -1029,6 +1033,10 @@
basic_machine=hppa1.1-winbond
os=-proelf
;;
+ xbox)
+ basic_machine=i686-pc
+ os=-mingw32
+ ;;
xps | xps100)
basic_machine=xps100-honeywell
;;
@@ -1059,6 +1067,9 @@
romp)
basic_machine=romp-ibm
;;
+ mmix)
+ basic_machine=mmix-knuth
+ ;;
rs6000)
basic_machine=rs6000-ibm
;;
@@ -1294,6 +1305,9 @@
-kaos*)
os=-kaos
;;
+ -zvmoe)
+ os=-zvmoe
+ ;;
-none)
;;
*)
@@ -1374,6 +1388,9 @@
*-ibm)
os=-aix
;;
+ *-knuth)
+ os=-mmixware
+ ;;
*-wec)
os=-proelf
;;
diff -Nur gnurobbo-0.57.bak/debian/changelog gnurobbo-0.57.dfsg/debian/changelog
--- gnurobbo-0.57.bak/debian/changelog 2005-03-12 23:54:07.000000000 +0100
+++ gnurobbo-0.57.dfsg/debian/changelog 2005-03-13 00:17:49.409896152 +0100
@@ -1,3 +1,11 @@
+gnurobbo (0.57.dfsg-0.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Remove non-free robbo.ttf font (Closes: #298955)
+ Use Vera.ttf from ttf-bitstream-vera instead
+
+ -- Frank Lichtenheld <[EMAIL PROTECTED]> Sat, 12 Mar 2005 23:57:48 +0100
+
gnurobbo (0.57-1) unstable; urgency=low
* Initial Release.
diff -Nur gnurobbo-0.57.bak/debian/control gnurobbo-0.57.dfsg/debian/control
--- gnurobbo-0.57.bak/debian/control 2005-03-12 23:54:07.000000000 +0100
+++ gnurobbo-0.57.dfsg/debian/control 2005-03-13 00:17:15.815003352 +0100
@@ -2,7 +2,7 @@
Section: games
Priority: optional
Maintainer: Lukasz Jachowicz <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), libsdl-ttf2.0-dev, libsdl1.2-dev (>>
1.2.7)
+Build-Depends: debhelper (>= 4.0.0), libsdl-ttf2.0-dev, libsdl1.2-dev (>>
1.2.7), ttf-bitstream-vera
Standards-Version: 3.6.0
Package: gnurobbo
diff -Nur gnurobbo-0.57.bak/debian/control~ gnurobbo-0.57.dfsg/debian/control~
--- gnurobbo-0.57.bak/debian/control~ 1970-01-01 01:00:00.000000000 +0100
+++ gnurobbo-0.57.dfsg/debian/control~ 2005-03-12 23:54:09.316783120 +0100
@@ -0,0 +1,17 @@
+Source: gnurobbo
+Section: games
+Priority: optional
+Maintainer: Lukasz Jachowicz <[EMAIL PROTECTED]>
+Build-Depends: debhelper (>= 4.0.0), libsdl-ttf2.0-dev, libsdl1.2-dev (>>
1.2.7)
+Standards-Version: 3.6.0
+
+Package: gnurobbo
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: GNU Robbo is logic game ported from ATARI XE/XL
+ GNU Robbo is very addictive logic game. You must help
+ little robot to get out of unfriendly planet, collecting
+ parts of emergency capsule
+ .
+ Originally written for Atari XE/XL by Janusz Pelc
+ from "LK. Avalon".
diff -Nur gnurobbo-0.57.bak/debian/rules gnurobbo-0.57.dfsg/debian/rules
--- gnurobbo-0.57.bak/debian/rules 2005-03-12 23:54:07.000000000 +0100
+++ gnurobbo-0.57.dfsg/debian/rules 2005-03-13 00:05:00.489789776 +0100
@@ -26,6 +26,8 @@
config.status: configure
dh_testdir
+ touch Makefile.am
+ touch Makefile.in
# Add here commands to configure the package.
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info --bindir=\$${prefix}/games
--datadir=\$${prefix}/share/games
diff -Nur gnurobbo-0.57.bak/.deps/board.P gnurobbo-0.57.dfsg/.deps/board.P
--- gnurobbo-0.57.bak/.deps/board.P 2002-11-03 15:23:06.000000000 +0100
+++ gnurobbo-0.57.dfsg/.deps/board.P 1970-01-01 01:00:00.000000000 +0100
@@ -1,75 +0,0 @@
-board.o: board.c game.h config.h /usr/include/SDL/SDL.h \
- /usr/include/SDL/SDL_main.h /usr/include/SDL/SDL_types.h \
- /usr/include/SDL/SDL_getenv.h /usr/include/SDL/SDL_error.h \
- /usr/include/SDL/begin_code.h /usr/include/SDL/close_code.h \
- /usr/include/SDL/SDL_rwops.h \
- /usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2/include/stdio.h \
- /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/gnu/stubs.h \
- /usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2/include/stddef.h \
- /usr/include/bits/types.h /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/sched.h /usr/include/libio.h /usr/include/_G_config.h \
- /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
- /usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2/include/stdarg.h \
- /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/bits/stdio.h /usr/include/SDL/SDL_timer.h \
- /usr/include/SDL/SDL_audio.h /usr/include/SDL/SDL_byteorder.h \
- /usr/include/SDL/SDL_cdrom.h /usr/include/SDL/SDL_joystick.h \
- /usr/include/SDL/SDL_events.h /usr/include/SDL/SDL_active.h \
- /usr/include/SDL/SDL_keyboard.h /usr/include/SDL/SDL_keysym.h \
- /usr/include/SDL/SDL_mouse.h /usr/include/SDL/SDL_video.h \
- /usr/include/SDL/SDL_mutex.h /usr/include/SDL/SDL_quit.h \
- /usr/include/SDL/SDL_version.h /usr/include/SDL/SDL_endian.h \
- /usr/include/asm/byteorder.h /usr/include/asm/types.h \
- /usr/include/linux/byteorder/little_endian.h \
- /usr/include/linux/byteorder/swab.h \
- /usr/include/linux/byteorder/generic.h /usr/include/SDL/SDL_ttf.h
-board.c :
-game.h :
-config.h :
-/usr/include/SDL/SDL.h :
-/usr/include/SDL/SDL_main.h :
-/usr/include/SDL/SDL_types.h :
-/usr/include/SDL/SDL_getenv.h :
-/usr/include/SDL/SDL_error.h :
-/usr/include/SDL/begin_code.h :
-/usr/include/SDL/close_code.h :
-/usr/include/SDL/SDL_rwops.h :
-/usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2/include/stdio.h :
-/usr/include/features.h :
-/usr/include/sys/cdefs.h :
-/usr/include/gnu/stubs.h :
-/usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2/include/stddef.h :
-/usr/include/bits/types.h :
-/usr/include/bits/pthreadtypes.h :
-/usr/include/bits/sched.h :
-/usr/include/libio.h :
-/usr/include/_G_config.h :
-/usr/include/wchar.h :
-/usr/include/bits/wchar.h :
-/usr/include/gconv.h :
-/usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2/include/stdarg.h :
-/usr/include/bits/stdio_lim.h :
-/usr/include/bits/sys_errlist.h :
-/usr/include/bits/stdio.h :
-/usr/include/SDL/SDL_timer.h :
-/usr/include/SDL/SDL_audio.h :
-/usr/include/SDL/SDL_byteorder.h :
-/usr/include/SDL/SDL_cdrom.h :
-/usr/include/SDL/SDL_joystick.h :
-/usr/include/SDL/SDL_events.h :
-/usr/include/SDL/SDL_active.h :
-/usr/include/SDL/SDL_keyboard.h :
-/usr/include/SDL/SDL_keysym.h :
-/usr/include/SDL/SDL_mouse.h :
-/usr/include/SDL/SDL_video.h :
-/usr/include/SDL/SDL_mutex.h :
-/usr/include/SDL/SDL_quit.h :
-/usr/include/SDL/SDL_version.h :
-/usr/include/SDL/SDL_endian.h :
-/usr/include/asm/byteorder.h :
-/usr/include/asm/types.h :
-/usr/include/linux/byteorder/little_endian.h :
-/usr/include/linux/byteorder/swab.h :
-/usr/include/linux/byteorder/generic.h :
-/usr/include/SDL/SDL_ttf.h :
diff -Nur gnurobbo-0.57.bak/.deps/data_init.P
gnurobbo-0.57.dfsg/.deps/data_init.P
--- gnurobbo-0.57.bak/.deps/data_init.P 2002-11-03 15:23:07.000000000 +0100
+++ gnurobbo-0.57.dfsg/.deps/data_init.P 1970-01-01 01:00:00.000000000
+0100
@@ -1,75 +0,0 @@
-data_init.o: data_init.c game.h config.h /usr/include/SDL/SDL.h \
- /usr/include/SDL/SDL_main.h /usr/include/SDL/SDL_types.h \
- /usr/include/SDL/SDL_getenv.h /usr/include/SDL/SDL_error.h \
- /usr/include/SDL/begin_code.h /usr/include/SDL/close_code.h \
- /usr/include/SDL/SDL_rwops.h \
- /usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2/include/stdio.h \
- /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/gnu/stubs.h \
- /usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2/include/stddef.h \
- /usr/include/bits/types.h /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/sched.h /usr/include/libio.h /usr/include/_G_config.h \
- /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
- /usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2/include/stdarg.h \
- /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/bits/stdio.h /usr/include/SDL/SDL_timer.h \
- /usr/include/SDL/SDL_audio.h /usr/include/SDL/SDL_byteorder.h \
- /usr/include/SDL/SDL_cdrom.h /usr/include/SDL/SDL_joystick.h \
- /usr/include/SDL/SDL_events.h /usr/include/SDL/SDL_active.h \
- /usr/include/SDL/SDL_keyboard.h /usr/include/SDL/SDL_keysym.h \
- /usr/include/SDL/SDL_mouse.h /usr/include/SDL/SDL_video.h \
- /usr/include/SDL/SDL_mutex.h /usr/include/SDL/SDL_quit.h \
- /usr/include/SDL/SDL_version.h /usr/include/SDL/SDL_endian.h \
- /usr/include/asm/byteorder.h /usr/include/asm/types.h \
- /usr/include/linux/byteorder/little_endian.h \
- /usr/include/linux/byteorder/swab.h \
- /usr/include/linux/byteorder/generic.h /usr/include/SDL/SDL_ttf.h
-data_init.c :
-game.h :
-config.h :
-/usr/include/SDL/SDL.h :
-/usr/include/SDL/SDL_main.h :
-/usr/include/SDL/SDL_types.h :
-/usr/include/SDL/SDL_getenv.h :
-/usr/include/SDL/SDL_error.h :
-/usr/include/SDL/begin_code.h :
-/usr/include/SDL/close_code.h :
-/usr/include/SDL/SDL_rwops.h :
-/usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2/include/stdio.h :
-/usr/include/features.h :
-/usr/include/sys/cdefs.h :
-/usr/include/gnu/stubs.h :
-/usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2/include/stddef.h :
-/usr/include/bits/types.h :
-/usr/include/bits/pthreadtypes.h :
-/usr/include/bits/sched.h :
-/usr/include/libio.h :
-/usr/include/_G_config.h :
-/usr/include/wchar.h :
-/usr/include/bits/wchar.h :
-/usr/include/gconv.h :
-/usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2/include/stdarg.h :
-/usr/include/bits/stdio_lim.h :
-/usr/include/bits/sys_errlist.h :
-/usr/include/bits/stdio.h :
-/usr/include/SDL/SDL_timer.h :
-/usr/include/SDL/SDL_audio.h :
-/usr/include/SDL/SDL_byteorder.h :
-/usr/include/SDL/SDL_cdrom.h :
-/usr/include/SDL/SDL_joystick.h :
-/usr/include/SDL/SDL_events.h :
-/usr/include/SDL/SDL_active.h :
-/usr/include/SDL/SDL_keyboard.h :
-/usr/include/SDL/SDL_keysym.h :
-/usr/include/SDL/SDL_mouse.h :
-/usr/include/SDL/SDL_video.h :
-/usr/include/SDL/SDL_mutex.h :
-/usr/include/SDL/SDL_quit.h :
-/usr/include/SDL/SDL_version.h :
-/usr/include/SDL/SDL_endian.h :
-/usr/include/asm/byteorder.h :
-/usr/include/asm/types.h :
-/usr/include/linux/byteorder/little_endian.h :
-/usr/include/linux/byteorder/swab.h :
-/usr/include/linux/byteorder/generic.h :
-/usr/include/SDL/SDL_ttf.h :
diff -Nur gnurobbo-0.57.bak/.deps/game.P gnurobbo-0.57.dfsg/.deps/game.P
--- gnurobbo-0.57.bak/.deps/game.P 2002-11-03 15:23:05.000000000 +0100
+++ gnurobbo-0.57.dfsg/.deps/game.P 1970-01-01 01:00:00.000000000 +0100
@@ -1,78 +0,0 @@
-game.o: game.c game.h config.h /usr/include/SDL/SDL.h \
- /usr/include/SDL/SDL_main.h /usr/include/SDL/SDL_types.h \
- /usr/include/SDL/SDL_getenv.h /usr/include/SDL/SDL_error.h \
- /usr/include/SDL/begin_code.h /usr/include/SDL/close_code.h \
- /usr/include/SDL/SDL_rwops.h \
- /usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2/include/stdio.h \
- /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/gnu/stubs.h \
- /usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2/include/stddef.h \
- /usr/include/bits/types.h /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/sched.h /usr/include/libio.h /usr/include/_G_config.h \
- /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \
- /usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2/include/stdarg.h \
- /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/bits/stdio.h /usr/include/SDL/SDL_timer.h \
- /usr/include/SDL/SDL_audio.h /usr/include/SDL/SDL_byteorder.h \
- /usr/include/SDL/SDL_cdrom.h /usr/include/SDL/SDL_joystick.h \
- /usr/include/SDL/SDL_events.h /usr/include/SDL/SDL_active.h \
- /usr/include/SDL/SDL_keyboard.h /usr/include/SDL/SDL_keysym.h \
- /usr/include/SDL/SDL_mouse.h /usr/include/SDL/SDL_video.h \
- /usr/include/SDL/SDL_mutex.h /usr/include/SDL/SDL_quit.h \
- /usr/include/SDL/SDL_version.h /usr/include/SDL/SDL_endian.h \
- /usr/include/asm/byteorder.h /usr/include/asm/types.h \
- /usr/include/linux/byteorder/little_endian.h \
- /usr/include/linux/byteorder/swab.h \
- /usr/include/linux/byteorder/generic.h /usr/include/SDL/SDL_ttf.h \
- /usr/include/time.h /usr/include/bits/time.h
-game.c :
-game.h :
-config.h :
-/usr/include/SDL/SDL.h :
-/usr/include/SDL/SDL_main.h :
-/usr/include/SDL/SDL_types.h :
-/usr/include/SDL/SDL_getenv.h :
-/usr/include/SDL/SDL_error.h :
-/usr/include/SDL/begin_code.h :
-/usr/include/SDL/close_code.h :
-/usr/include/SDL/SDL_rwops.h :
-/usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2/include/stdio.h :
-/usr/include/features.h :
-/usr/include/sys/cdefs.h :
-/usr/include/gnu/stubs.h :
-/usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2/include/stddef.h :
-/usr/include/bits/types.h :
-/usr/include/bits/pthreadtypes.h :
-/usr/include/bits/sched.h :
-/usr/include/libio.h :
-/usr/include/_G_config.h :
-/usr/include/wchar.h :
-/usr/include/bits/wchar.h :
-/usr/include/gconv.h :
-/usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2/include/stdarg.h :
-/usr/include/bits/stdio_lim.h :
-/usr/include/bits/sys_errlist.h :
-/usr/include/bits/stdio.h :
-/usr/include/SDL/SDL_timer.h :
-/usr/include/SDL/SDL_audio.h :
-/usr/include/SDL/SDL_byteorder.h :
-/usr/include/SDL/SDL_cdrom.h :
-/usr/include/SDL/SDL_joystick.h :
-/usr/include/SDL/SDL_events.h :
-/usr/include/SDL/SDL_active.h :
-/usr/include/SDL/SDL_keyboard.h :
-/usr/include/SDL/SDL_keysym.h :
-/usr/include/SDL/SDL_mouse.h :
-/usr/include/SDL/SDL_video.h :
-/usr/include/SDL/SDL_mutex.h :
-/usr/include/SDL/SDL_quit.h :
-/usr/include/SDL/SDL_version.h :
-/usr/include/SDL/SDL_endian.h :
-/usr/include/asm/byteorder.h :
-/usr/include/asm/types.h :
-/usr/include/linux/byteorder/little_endian.h :
-/usr/include/linux/byteorder/swab.h :
-/usr/include/linux/byteorder/generic.h :
-/usr/include/SDL/SDL_ttf.h :
-/usr/include/time.h :
-/usr/include/bits/time.h :
diff -Nur gnurobbo-0.57.bak/game.h gnurobbo-0.57.dfsg/game.h
--- gnurobbo-0.57.bak/game.h 2002-11-14 17:16:58.000000000 +0100
+++ gnurobbo-0.57.dfsg/game.h 2005-03-13 00:13:25.917953016 +0100
@@ -72,15 +72,15 @@
#define BMP_ICONS (PACKAGE_DATA_DIR "pixmaps/icons.bmp")
#define BMP_CIPHERS (PACKAGE_DATA_DIR "pixmaps/ciphers.bmp")
#define BMP_BACKGROUND (PACKAGE_DATA_DIR "pixmaps/background.bmp")
-#define ROBBO_FONT (PACKAGE_DATA_DIR "robbo.ttf")
#define ROBBO_LEVELS (PACKAGE_DATA_DIR "levels.dat")
#else
#define BMP_ICONS "pixmaps/icons.bmp"
#define BMP_CIPHERS "pixmaps/ciphers.bmp"
-#define ROBBO_FONT "robbo.ttf"
#define ROBBO_LEVELS "levels.dat"
#endif
+#define ROBBO_FONT "/usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf"
+
#define FONTSIZE 15
#define RESOURCE_FILE "/.gnurobborc"
diff -Nur gnurobbo-0.57.bak/Makefile.am gnurobbo-0.57.dfsg/Makefile.am
--- gnurobbo-0.57.bak/Makefile.am 2002-10-17 16:37:48.000000000 +0200
+++ gnurobbo-0.57.dfsg/Makefile.am 2005-03-13 00:04:24.743224080 +0100
@@ -1,7 +1,7 @@
bin_PROGRAMS = gnurobbo
gnurobbo_SOURCES = game.c game.h board.c data_init.c
-EXTRA_DIST = levels.dat icons/icons.bmp robbo.ttf icons/ciphers.bmp
icons/background.bmp
+EXTRA_DIST = levels.dat icons/icons.bmp icons/ciphers.bmp icons/background.bmp
install-data-local:
@$(NORMAL_INSTALL)
@@ -13,7 +13,6 @@
fi \
done \
fi
- $(INSTALL_DATA) robbo.ttf $(DESTDIR)$(pkgdatadir)
$(INSTALL_DATA) levels.dat $(DESTDIR)$(pkgdatadir)
dist-hook:
@@ -25,5 +24,4 @@
fi \
done \
fi
- cp -p robbo.ttf $(destdir)
cp -p levels.dat $(destdir)
diff -Nur gnurobbo-0.57.bak/Makefile.in gnurobbo-0.57.dfsg/Makefile.in
--- gnurobbo-0.57.bak/Makefile.in 2002-11-13 14:49:16.000000000 +0100
+++ gnurobbo-0.57.dfsg/Makefile.in 2005-03-13 00:04:17.257362104 +0100
@@ -105,7 +105,7 @@
bin_PROGRAMS = gnurobbo
gnurobbo_SOURCES = game.c game.h board.c data_init.c
-EXTRA_DIST = levels.dat icons/icons.bmp robbo.ttf icons/ciphers.bmp
icons/background.bmp
+EXTRA_DIST = levels.dat icons/icons.bmp icons/ciphers.bmp icons/background.bmp
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -507,7 +507,6 @@
fi \
done \
fi
- $(INSTALL_DATA) robbo.ttf $(DESTDIR)$(pkgdatadir)
$(INSTALL_DATA) levels.dat $(DESTDIR)$(pkgdatadir)
dist-hook:
@@ -519,7 +518,6 @@
fi \
done \
fi
- cp -p robbo.ttf $(destdir)
cp -p levels.dat $(destdir)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Bin�rdateien gnurobbo-0.57.bak/robbo.ttf and gnurobbo-0.57.dfsg/robbo.ttf sind
verschieden.
