diff -u adonthell-0.3.4.cvs.20050813/config.guess adonthell-0.3.4.cvs.20050813/config.guess --- adonthell-0.3.4.cvs.20050813/config.guess +++ adonthell-0.3.4.cvs.20050813/config.guess @@ -1,10 +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, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2006-07-02' +timestamp='2006-02-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 @@ -211,7 +210,7 @@ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} + echo powerppc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -771,8 +770,6 @@ case ${UNAME_MACHINE} in pc98) echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac @@ -783,6 +780,9 @@ i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS_NT-*:*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -790,10 +790,10 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) + x86:Interix*:[345]*) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T:Interix*:[3456]*) + EM64T:Interix*:[345]*) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) @@ -831,9 +831,6 @@ arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -992,7 +989,7 @@ LIBC=gnulibc1 # endif #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun) LIBC=gnu #else LIBC=gnuaout diff -u adonthell-0.3.4.cvs.20050813/config.sub adonthell-0.3.4.cvs.20050813/config.sub --- adonthell-0.3.4.cvs.20050813/config.sub +++ adonthell-0.3.4.cvs.20050813/config.sub @@ -1,10 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2006-07-02' +timestamp='2006-02-23' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -241,7 +240,7 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -249,8 +248,7 @@ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -276,11 +274,11 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | 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 | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ + | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b \ + | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ @@ -288,6 +286,9 @@ | z8k) basic_machine=$basic_machine-unknown ;; + m32c) + basic_machine=$basic_machine-unknown + ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -317,7 +318,7 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ + | avr-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ @@ -328,7 +329,7 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32c-* | m32r-* | m32rle-* \ + | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -357,11 +358,11 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ @@ -372,6 +373,8 @@ | ymp-* \ | z8k-*) ;; + m32c-*) + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -1125,7 +1128,7 @@ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; cydra) @@ -1214,7 +1217,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers*) + | -skyos* | -haiku* | -rdos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1366,9 +1369,6 @@ # system, and we'll never get to this point. case $basic_machine in - spu-*) - os=-elf - ;; *-acorn) os=-riscix1.2 ;; @@ -1378,9 +1378,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 diff -u adonthell-0.3.4.cvs.20050813/debian/changelog adonthell-0.3.4.cvs.20050813/debian/changelog --- adonthell-0.3.4.cvs.20050813/debian/changelog +++ adonthell-0.3.4.cvs.20050813/debian/changelog @@ -1,3 +1,11 @@ +adonthell (0.3.4.cvs.20050813-2.3ubuntu1) feisty; urgency=low + + * Merge from debian unstable. Ubuntu changes are as follows: + - Added patch to fix SDL include statement in src/py_adonthell.i + (Reverted one hunk to fix FTBFS. + + -- Luke Yelavich Sat, 18 Nov 2006 08:57:10 +1100 + adonthell (0.3.4.cvs.20050813-2.3) unstable; urgency=low * Non-maintainer upload. @@ -5,6 +13,13 @@ -- Mohammed Adnène Trojette Wed, 20 Sep 2006 00:27:19 +0200 +adonthell (0.3.4.cvs.20050813-2.2ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + * Added patch to fix SDL include statement in src/py_adonthell.i + + -- Stephan Hermann Tue, 19 Sep 2006 14:11:29 +0200 + adonthell (0.3.4.cvs.20050813-2.2) unstable; urgency=medium * Non-maintainer upload with medium urgency. @@ -27,6 +42,13 @@ -- Mohammed Adnène Trojette Thu, 10 Aug 2006 20:47:56 +0200 +adonthell (0.3.4.cvs.20050813-2.1ubuntu1) edgy; urgency=low + + * Re-sync with Debian + * python2.3->python2.4 + + -- Barry deFreese Thu, 20 Jul 2006 21:20:58 -0400 + adonthell (0.3.4.cvs.20050813-2.1) unstable; urgency=low * Non-maintainer upload. @@ -116,0 +139 @@ + diff -u adonthell-0.3.4.cvs.20050813/debian/patches/02_use_libsdl-ttf.diff adonthell-0.3.4.cvs.20050813/debian/patches/02_use_libsdl-ttf.diff --- adonthell-0.3.4.cvs.20050813/debian/patches/02_use_libsdl-ttf.diff +++ adonthell-0.3.4.cvs.20050813/debian/patches/02_use_libsdl-ttf.diff @@ -1,7 +1,7 @@ -Index: adonthell-0.3.4.cvs.20050813/src/audio.h +Index: adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/audio.h =================================================================== ---- adonthell-0.3.4.cvs.20050813.orig/src/audio.h 2006-08-11 20:08:00.000000000 +0200 -+++ adonthell-0.3.4.cvs.20050813/src/audio.h 2006-08-11 20:41:27.000000000 +0200 +--- adonthell-0.3.4.cvs.20050813-2.2ubuntu1.orig/src/audio.h 2006-08-13 01:24:00.000000000 +0200 ++++ adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/audio.h 2006-09-19 13:41:04.815903000 +0200 @@ -15,7 +15,7 @@ #ifndef __AUDIO_H__ #define __AUDIO_H__ @@ -11,10 +11,10 @@ #include "prefs.h" #include "py_object.h" // #include "audio_loop.h" -Index: adonthell-0.3.4.cvs.20050813/src/audio_loop.cc +Index: adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/audio_loop.cc =================================================================== ---- adonthell-0.3.4.cvs.20050813.orig/src/audio_loop.cc 2006-08-11 20:08:00.000000000 +0200 -+++ adonthell-0.3.4.cvs.20050813/src/audio_loop.cc 2006-08-11 20:41:27.000000000 +0200 +--- adonthell-0.3.4.cvs.20050813-2.2ubuntu1.orig/src/audio_loop.cc 2006-08-13 01:24:01.000000000 +0200 ++++ adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/audio_loop.cc 2006-09-19 13:41:04.815903000 +0200 @@ -22,7 +22,7 @@ #include #include @@ -24,10 +24,10 @@ #include "types.h" #include "fileops.h" -Index: adonthell-0.3.4.cvs.20050813/src/input.h +Index: adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/input.h =================================================================== ---- adonthell-0.3.4.cvs.20050813.orig/src/input.h 2006-08-11 20:08:00.000000000 +0200 -+++ adonthell-0.3.4.cvs.20050813/src/input.h 2006-08-11 20:41:27.000000000 +0200 +--- adonthell-0.3.4.cvs.20050813-2.2ubuntu1.orig/src/input.h 2006-08-13 01:24:02.000000000 +0200 ++++ adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/input.h 2006-09-19 13:41:04.815903000 +0200 @@ -28,7 +28,7 @@ #define INPUT_H__ @@ -37,10 +37,10 @@ /** -Index: adonthell-0.3.4.cvs.20050813/src/Makefile.am +Index: adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/Makefile.am =================================================================== ---- adonthell-0.3.4.cvs.20050813.orig/src/Makefile.am 2006-08-11 20:07:59.000000000 +0200 -+++ adonthell-0.3.4.cvs.20050813/src/Makefile.am 2006-08-11 20:41:27.000000000 +0200 +--- adonthell-0.3.4.cvs.20050813-2.2ubuntu1.orig/src/Makefile.am 2006-08-13 01:24:00.000000000 +0200 ++++ adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/Makefile.am 2006-09-19 13:41:04.815903000 +0200 @@ -24,7 +24,7 @@ win_base.h win_border.h win_container.h str_hash.h win_font.h win_image.h \ win_label.h win_mapview.h label.h label_input.h win_scrollbar.h win_scroll.h \ @@ -60,10 +60,10 @@ libadonthell_LDADD = $(SDL_LIBS) $(OGG_LIBS) $(PY_LIBS) $(INTLLIBS) $(FT2_LIBS) -Index: adonthell-0.3.4.cvs.20050813/src/mixer.c +Index: adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/mixer.c =================================================================== ---- adonthell-0.3.4.cvs.20050813.orig/src/mixer.c 2006-08-11 20:07:59.000000000 +0200 -+++ adonthell-0.3.4.cvs.20050813/src/mixer.c 2006-08-11 20:41:27.000000000 +0200 +--- adonthell-0.3.4.cvs.20050813-2.2ubuntu1.orig/src/mixer.c 2006-08-13 01:24:01.000000000 +0200 ++++ adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/mixer.c 2006-09-19 13:41:04.815903000 +0200 @@ -28,11 +28,11 @@ #include #include @@ -80,10 +80,10 @@ static int audio_opened = 0; -Index: adonthell-0.3.4.cvs.20050813/src/music_cmd.c +Index: adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/music_cmd.c =================================================================== ---- adonthell-0.3.4.cvs.20050813.orig/src/music_cmd.c 2006-08-11 20:07:59.000000000 +0200 -+++ adonthell-0.3.4.cvs.20050813/src/music_cmd.c 2006-08-11 20:41:27.000000000 +0200 +--- adonthell-0.3.4.cvs.20050813-2.2ubuntu1.orig/src/music_cmd.c 2006-08-13 01:24:01.000000000 +0200 ++++ adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/music_cmd.c 2006-09-19 13:41:04.815903000 +0200 @@ -34,7 +34,7 @@ #include #include @@ -93,10 +93,10 @@ #include "music_cmd.h" /* Unimplemented */ -Index: adonthell-0.3.4.cvs.20050813/src/music_ogg.c +Index: adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/music_ogg.c =================================================================== ---- adonthell-0.3.4.cvs.20050813.orig/src/music_ogg.c 2006-08-11 20:07:59.000000000 +0200 -+++ adonthell-0.3.4.cvs.20050813/src/music_ogg.c 2006-08-11 20:41:27.000000000 +0200 +--- adonthell-0.3.4.cvs.20050813-2.2ubuntu1.orig/src/music_ogg.c 2006-08-13 01:24:01.000000000 +0200 ++++ adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/music_ogg.c 2006-09-19 13:41:04.815903000 +0200 @@ -30,7 +30,7 @@ #include #include @@ -106,10 +106,10 @@ #include "music_ogg.h" /* This is the format of the audio mixer data */ -Index: adonthell-0.3.4.cvs.20050813/src/py_adonthell.i +Index: adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/py_adonthell.i =================================================================== ---- adonthell-0.3.4.cvs.20050813.orig/src/py_adonthell.i 2006-08-11 20:07:59.000000000 +0200 -+++ adonthell-0.3.4.cvs.20050813/src/py_adonthell.i 2006-08-11 20:41:27.000000000 +0200 +--- adonthell-0.3.4.cvs.20050813-2.2ubuntu1.orig/src/py_adonthell.i 2006-08-13 01:24:01.000000000 +0200 ++++ adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/py_adonthell.i 2006-09-19 13:41:18.672769000 +0200 @@ -11,7 +11,7 @@ #include "storage.h" #include "gametime.h" @@ -119,19 +119,10 @@ #include "input.h" #include "audio.h" #include "character_base.h" -@@ -104,7 +104,7 @@ - %include "storage.h" - %include "gametime.h" - %include "gamedate.h" --%include "SDL_keysym.h" -+%include - %include "input.h" - %include "audio.h" - %include "character_base.h" -Index: adonthell-0.3.4.cvs.20050813/src/py_adonthell_wrap.cc +Index: adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/py_adonthell_wrap.cc =================================================================== ---- adonthell-0.3.4.cvs.20050813.orig/src/py_adonthell_wrap.cc 2006-08-11 20:07:59.000000000 +0200 -+++ adonthell-0.3.4.cvs.20050813/src/py_adonthell_wrap.cc 2006-08-11 20:41:27.000000000 +0200 +--- adonthell-0.3.4.cvs.20050813-2.2ubuntu1.orig/src/py_adonthell_wrap.cc 2006-08-13 01:24:03.000000000 +0200 ++++ adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/py_adonthell_wrap.cc 2006-09-19 13:41:04.831904000 +0200 @@ -1442,7 +1442,7 @@ #include "storage.h" #include "gametime.h" @@ -141,10 +132,10 @@ #include "input.h" #include "audio.h" #include "character_base.h" -Index: adonthell-0.3.4.cvs.20050813/src/tools/fontedit/font_editor.cc +Index: adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/tools/fontedit/font_editor.cc =================================================================== ---- adonthell-0.3.4.cvs.20050813.orig/src/tools/fontedit/font_editor.cc 2006-08-11 20:07:59.000000000 +0200 -+++ adonthell-0.3.4.cvs.20050813/src/tools/fontedit/font_editor.cc 2006-08-11 20:41:27.000000000 +0200 +--- adonthell-0.3.4.cvs.20050813-2.2ubuntu1.orig/src/tools/fontedit/font_editor.cc 2006-08-13 01:24:05.000000000 +0200 ++++ adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/tools/fontedit/font_editor.cc 2006-09-19 13:41:04.831904000 +0200 @@ -2,7 +2,7 @@ #include #include @@ -154,10 +145,10 @@ #include "types.h" #include "screen.h" #include "image.h" -Index: adonthell-0.3.4.cvs.20050813/src/wavestream.c +Index: adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/wavestream.c =================================================================== ---- adonthell-0.3.4.cvs.20050813.orig/src/wavestream.c 2006-08-11 20:07:59.000000000 +0200 -+++ adonthell-0.3.4.cvs.20050813/src/wavestream.c 2006-08-11 20:41:27.000000000 +0200 +--- adonthell-0.3.4.cvs.20050813-2.2ubuntu1.orig/src/wavestream.c 2006-08-13 01:24:03.000000000 +0200 ++++ adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/wavestream.c 2006-09-19 13:41:04.831904000 +0200 @@ -27,10 +27,10 @@ #include #include @@ -173,10 +164,10 @@ #include "wave.h" #include "wavestream.h" -Index: adonthell-0.3.4.cvs.20050813/src/win_ttf.h +Index: adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/win_ttf.h =================================================================== ---- adonthell-0.3.4.cvs.20050813.orig/src/win_ttf.h 2006-08-11 20:07:59.000000000 +0200 -+++ adonthell-0.3.4.cvs.20050813/src/win_ttf.h 2006-08-11 20:41:27.000000000 +0200 +--- adonthell-0.3.4.cvs.20050813-2.2ubuntu1.orig/src/win_ttf.h 2006-08-13 01:24:03.000000000 +0200 ++++ adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/win_ttf.h 2006-09-19 13:41:04.831904000 +0200 @@ -15,7 +15,7 @@ #ifndef WIN_TTF_H #define WIN_TTF_H @@ -186,10 +177,10 @@ #include "win_font.h" class win_ttf : public win_font -Index: adonthell-0.3.4.cvs.20050813/src/Makefile.in +Index: adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/Makefile.in =================================================================== ---- adonthell-0.3.4.cvs.20050813.orig/src/Makefile.in 2006-08-11 20:41:32.000000000 +0200 -+++ adonthell-0.3.4.cvs.20050813/src/Makefile.in 2006-08-11 20:42:21.000000000 +0200 +--- adonthell-0.3.4.cvs.20050813-2.2ubuntu1.orig/src/Makefile.in 2006-08-13 01:24:03.000000000 +0200 ++++ adonthell-0.3.4.cvs.20050813-2.2ubuntu1/src/Makefile.in 2006-09-19 13:41:04.835904250 +0200 @@ -199,7 +199,7 @@ win_base.h win_border.h win_container.h str_hash.h win_font.h win_image.h \ win_label.h win_mapview.h label.h label_input.h win_scrollbar.h win_scroll.h \