On Fri, Aug 11, 2006, Mohammed Adnène Trojette wrote:
> The patch also covers the python transition and Julien Danjou's patch.
Here is an updated patch that actually builds :)
--
adn
Mohammed Adnène Trojette
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,9 +1,10 @@
#! /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 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2006-02-23'
+timestamp='2006-07-02'
# 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
@@ -210,7 +211,7 @@
echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
exit ;;
macppc:MirBSD:*:*)
- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
exit ;;
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -770,6 +771,8 @@
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
@@ -780,9 +783,6 @@
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*:[345]*)
+ x86:Interix*:[3456]*)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
- EM64T:Interix*:[345]*)
+ EM64T:Interix*:[3456]*)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -831,6 +831,9 @@
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 ;;
@@ -989,7 +992,7 @@
LIBC=gnulibc1
# endif
#else
- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C)
|| defined(__SUNPRO_CC)
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,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2006-02-23'
+timestamp='2006-07-02'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -240,7 +241,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 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr |
avr32 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
@@ -248,7 +249,8 @@
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore
\
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -274,11 +276,11 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | 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 | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b \
- | strongarm \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet |
sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
@@ -286,9 +288,6 @@
| z8k)
basic_machine=$basic_machine-unknown
;;
- m32c)
- basic_machine=$basic_machine-unknown
- ;;
m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
@@ -318,7 +317,7 @@
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* \
+ | avr-* | avr32-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | craynv-* | cydra-* \
@@ -329,7 +328,7 @@
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
- | m32r-* | m32rle-* \
+ | m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -358,11 +357,11 @@
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | 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-* | sparc86x-* | sparclet-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* |
sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-*
| sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
@@ -373,8 +372,6 @@
| 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)
@@ -1128,7 +1125,7 @@
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sparc | sparcv8 | sparcv9 | sparcv9b)
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
basic_machine=sparc-sun
;;
cydra)
@@ -1217,7 +1214,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos*)
+ | -skyos* | -haiku* | -rdos* | -toppers*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1369,6 +1366,9 @@
# 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/control
adonthell-0.3.4.cvs.20050813/debian/control
--- adonthell-0.3.4.cvs.20050813/debian/control
+++ adonthell-0.3.4.cvs.20050813/debian/control
@@ -2,12 +2,12 @@
Section: games
Priority: optional
Maintainer: Gordon Fraser <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4), libsdl1.2-dev, python (>= 2.3), python-dev
(>=2.3), libvorbis-dev, zlib1g-dev, swig1.3 (>= 1.3.14), libfreetype6-dev,
libaa1-dev
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 5.0.37.2), libsdl1.2-dev, libvorbis-dev,
zlib1g-dev, swig1.3 (>= 1.3.14), libfreetype6-dev, libaa1-dev, python-dev (>=
2.3.5-11), python-support (>= 0.4.0), libsdl-ttf2.0-dev, libsdl-mixer1.2-dev,
libsdl1.2-dev, quilt
+Standards-Version: 3.7.2
Package: adonthell
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${python:Depends}
Recommends: adonthell-data (>= 0.3.3-3), adonthell-data (<< 0.4)
Conflicts: adonthell-data (<< 0.3.3-3)
Description: A 2D graphical roleplaying game
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,25 @@
+adonthell (0.3.4.cvs.20050813-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload with medium urgency.
+ * Update to the New Python Policy (Closes: #380756)
+ + debian/control
+ - bump build-dependency on debhelper to (>= 5.0.37.2)
+ - remove build-dependency on python and python-dev
+ - build-depend on python-dev (>= 2.3.5-11)
+ - build-depend on python-support (>= 0.4)
+ - depend on ${python:Depends}
+ + debian/rules
+ - build with $(shell pyversions -d) to make the package bin-NMUable
+ - run dh_pythonsupport only (hence the >= 0.4 build-dep)
+ * Build-Depend on libsdl1.2-dev, libsdl-ttf2.0-dev and libsdl-mixer1.2-dev
instead
+ of with the embedded version, add -lSDL_ttf to --with-py-libs in
debian/rules
+ and rebootstrap (Closes: #382202)
+ * Work around #374062 using a patch from Julien Danjou (Closes: #381456)
+ * Build-Depend on quilt for patch management and add adequate rules.
+ * Bump Standards-Version to 3.7.2.
+
+ -- Mohammed Adnène Trojette <[EMAIL PROTECTED]> Thu, 10 Aug 2006 20:47:56
+0200
+
adonthell (0.3.4.cvs.20050813-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -u adonthell-0.3.4.cvs.20050813/debian/rules
adonthell-0.3.4.cvs.20050813/debian/rules
--- adonthell-0.3.4.cvs.20050813/debian/rules
+++ adonthell-0.3.4.cvs.20050813/debian/rules
@@ -8,6 +8,7 @@
CFGDEBUG = ""
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL} -p -o root -g root -m 755
+PYVERSION=$(shell pyversions -d)
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CXXFLAGS += -g
@@ -31,8 +32,8 @@
--mandir=\$${prefix}/share/man \
--bindir=\$${prefix}/games \
--datadir=\$${prefix}/share/games \
- --with-py-libs="-Wl,-E -L/usr/lib/python2.3/config
-lpython2.3 -ldl -lpthread -lutil" \
- --with-py-cflags="-I/usr/include/python2.3" \
+ --with-py-libs="-Wl,-E -L/usr/lib/$(PYVERSION)/config
-l$(PYVERSION) -ldl -lpthread -lutil -lSDL -lSDL_ttf -lSDL_mixer" \
+ --with-py-cflags="-I/usr/include/$(PYVERSION)" \
$(CFGDEBUG)
touch configure-stamp
@@ -41,6 +42,7 @@
build-stamp:
dh_testdir
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
$(MAKE) CXXFLAGS="$(CXXFLAGS)" INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
touch build-stamp
@@ -56,6 +58,8 @@
cp -f /usr/share/misc/config.guess config.guess
-rm -f `find . -name "*~"`
-rm -f src/adonthell.pyc
+ QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+ rm -rf .pc
dh_clean
install: build
only in patch2:
unchanged:
--- adonthell-0.3.4.cvs.20050813.orig/debian/pyversions
+++ adonthell-0.3.4.cvs.20050813/debian/pyversions
@@ -0,0 +1 @@
+2.3-
only in patch2:
unchanged:
--- adonthell-0.3.4.cvs.20050813.orig/debian/patches/03_use_libsdl-mixer.diff
+++ adonthell-0.3.4.cvs.20050813/debian/patches/03_use_libsdl-mixer.diff
@@ -0,0 +1,17 @@
+Index: adonthell-0.3.4.cvs.20050813/src/music.c
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/music.c 2006-08-10
22:09:27.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/music.c 2006-08-11 20:06:40.000000000
+0200
+@@ -24,9 +24,9 @@
+
+ #include <stdlib.h>
+ #include <string.h>
+-#include "SDL_endian.h"
+-#include "SDL_audio.h"
+-#include "SDL_timer.h"
++#include <SDL/SDL_endian.h>
++#include <SDL/SDL_audio.h>
++#include <SDL/SDL_timer.h>
+
+ #include "SDL_mixer.h"
+
only in patch2:
unchanged:
--- adonthell-0.3.4.cvs.20050813.orig/debian/patches/series
+++ adonthell-0.3.4.cvs.20050813/debian/patches/series
@@ -0,0 +1,3 @@
+01_work_around_bug_381456.diff
+02_use_libsdl-ttf.diff
+03_use_libsdl-mixer.diff
only in patch2:
unchanged:
--- adonthell-0.3.4.cvs.20050813.orig/debian/patches/02_use_libsdl-ttf.diff
+++ adonthell-0.3.4.cvs.20050813/debian/patches/02_use_libsdl-ttf.diff
@@ -0,0 +1,237 @@
+Index: adonthell-0.3.4.cvs.20050813/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
+@@ -15,7 +15,7 @@
+ #ifndef __AUDIO_H__
+ #define __AUDIO_H__
+
+-#include "SDL_mixer.h"
++#include <SDL/SDL_mixer.h>
+ #include "prefs.h"
+ #include "py_object.h"
+ // #include "audio_loop.h"
+Index: adonthell-0.3.4.cvs.20050813/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
+@@ -22,7 +22,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <errno.h>
+-#include "SDL_mixer.h"
++#include <SDL/SDL_mixer.h>
+
+ #include "types.h"
+ #include "fileops.h"
+Index: adonthell-0.3.4.cvs.20050813/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
+@@ -28,7 +28,7 @@
+ #define INPUT_H__
+
+ #include "types.h"
+-#include "SDL_keysym.h"
++#include <SDL/SDL_keysym.h>
+
+
+ /**
+Index: adonthell-0.3.4.cvs.20050813/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
+@@ -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 \
+ win_select.h win_theme.h win_keys.h win_event.h win_types.h win_write.h \
+-win_ttf.h win_manager.h win_object.h window.h win_wrappers.h yarg.h SDL_ttf.h
++win_ttf.h win_manager.h win_object.h window.h win_wrappers.h yarg.h
+
+ libadonthell_a_SOURCES = adonthell.cc animation.cc audio.cc \
+ character_base.cc character.cc data_screen.cc dialog.cc dialog_screen.cc \
+@@ -40,8 +40,7 @@
+ win_ttf.cc win_keys.cc win_manager.cc win_scrollbar.cc win_scroll.cc \
+ win_select.cc \
+ win_theme.cc win_event.cc yarg.cc mixer.c music.c music_cmd.c music_cmd.h \
+-music_ogg.c music_ogg.h wave.h wavestream.c wavestream.h SDL_mixer.h \
+-SDL_ttf.c $(headers)
++music_ogg.c music_ogg.h wave.h wavestream.c wavestream.h $(headers)
+
+ libadonthell_LDADD = $(SDL_LIBS) $(OGG_LIBS) $(PY_LIBS) $(INTLLIBS)
$(FT2_LIBS)
+
+Index: adonthell-0.3.4.cvs.20050813/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
+@@ -28,11 +28,11 @@
+ #include <stdlib.h>
+ #include <string.h>
+
+-#include "SDL_mutex.h"
+-#include "SDL_endian.h"
+-#include "SDL_timer.h"
++#include <SDL/SDL_mutex.h>
++#include <SDL/SDL_endian.h>
++#include <SDL/SDL_timer.h>
+
+-#include "SDL_mixer.h"
++#include <SDL/SDL_mixer.h>
+
+ static int audio_opened = 0;
+
+Index: adonthell-0.3.4.cvs.20050813/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
+@@ -34,7 +34,7 @@
+ #include <string.h>
+ #include <signal.h>
+
+-#include "SDL_mixer.h"
++#include <SDL/SDL_mixer.h>
+ #include "music_cmd.h"
+
+ /* Unimplemented */
+Index: adonthell-0.3.4.cvs.20050813/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
+@@ -30,7 +30,7 @@
+ #include <stdio.h>
+ #include <string.h>
+
+-#include "SDL_mixer.h"
++#include <SDL/SDL_mixer.h>
+ #include "music_ogg.h"
+
+ /* This is the format of the audio mixer data */
+Index: adonthell-0.3.4.cvs.20050813/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
+@@ -11,7 +11,7 @@
+ #include "storage.h"
+ #include "gametime.h"
+ #include "gamedate.h"
+-#include "SDL_keysym.h"
++#include <SDL/SDL_keysym.h>
+ #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 <SDL/SDL_keysym.h>
+ %include "input.h"
+ %include "audio.h"
+ %include "character_base.h"
+Index: adonthell-0.3.4.cvs.20050813/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
+@@ -1442,7 +1442,7 @@
+ #include "storage.h"
+ #include "gametime.h"
+ #include "gamedate.h"
+-#include "SDL_keysym.h"
++#include <SDL/SDL_keysym.h>
+ #include "input.h"
+ #include "audio.h"
+ #include "character_base.h"
+Index: adonthell-0.3.4.cvs.20050813/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
+@@ -2,7 +2,7 @@
+ #include <unistd.h>
+ #include <list>
+ #include <stdlib.h>
+-#include "SDL_thread.h"
++#include <SDL/SDL_thread.h>
+ #include "types.h"
+ #include "screen.h"
+ #include "image.h"
+Index: adonthell-0.3.4.cvs.20050813/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
+@@ -27,10 +27,10 @@
+ #include <stdlib.h>
+ #include <string.h>
+
+-#include "SDL_audio.h"
+-#include "SDL_mutex.h"
+-#include "SDL_rwops.h"
+-#include "SDL_endian.h"
++#include <SDL/SDL_audio.h>
++#include <SDL/SDL_mutex.h>
++#include <SDL/SDL_rwops.h>
++#include <SDL/SDL_endian.h>
+
+ #include "wave.h"
+ #include "wavestream.h"
+Index: adonthell-0.3.4.cvs.20050813/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
+@@ -15,7 +15,7 @@
+ #ifndef WIN_TTF_H
+ #define WIN_TTF_H
+
+-#include "SDL_ttf.h"
++#include <SDL/SDL_ttf.h>
+ #include "win_font.h"
+
+ class win_ttf : public win_font
+Index: adonthell-0.3.4.cvs.20050813/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
+@@ -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 \
+ win_select.h win_theme.h win_keys.h win_event.h win_types.h win_write.h \
+-win_ttf.h win_manager.h win_object.h window.h win_wrappers.h yarg.h SDL_ttf.h
++win_ttf.h win_manager.h win_object.h window.h win_wrappers.h yarg.h
+
+
+ libadonthell_a_SOURCES = adonthell.cc animation.cc audio.cc \
+@@ -216,8 +216,7 @@
+ win_ttf.cc win_keys.cc win_manager.cc win_scrollbar.cc win_scroll.cc \
+ win_select.cc \
+ win_theme.cc win_event.cc yarg.cc mixer.c music.c music_cmd.c music_cmd.h \
+-music_ogg.c music_ogg.h wave.h wavestream.c wavestream.h SDL_mixer.h \
+-SDL_ttf.c $(headers)
++music_ogg.c music_ogg.h wave.h wavestream.c wavestream.h $(headers)
+
+
+ libadonthell_LDADD = $(SDL_LIBS) $(OGG_LIBS) $(PY_LIBS) $(INTLLIBS)
$(FT2_LIBS)
+@@ -261,7 +260,7 @@
+ win_scroll.$(OBJEXT) win_select.$(OBJEXT) win_theme.$(OBJEXT) \
+ win_event.$(OBJEXT) yarg.$(OBJEXT) mixer.$(OBJEXT) \
+ music.$(OBJEXT) music_cmd.$(OBJEXT) music_ogg.$(OBJEXT) \
+- wavestream.$(OBJEXT) SDL_ttf.$(OBJEXT) $(am__objects_1)
++ wavestream.$(OBJEXT) $(am__objects_1)
+ libadonthell_a_OBJECTS = $(am_libadonthell_a_OBJECTS)
+ bin_PROGRAMS = adonthell$(EXEEXT)
+ PROGRAMS = $(bin_PROGRAMS)
+@@ -274,7 +273,7 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
[EMAIL PROTECTED]@DEP_FILES = ./$(DEPDIR)/SDL_ttf.Po ./$(DEPDIR)/adonthell.Po \
[EMAIL PROTECTED]@DEP_FILES = ./$(DEPDIR)/adonthell.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/animation.Po ./$(DEPDIR)/audio.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/character.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/character_base.Po \
+@@ -398,7 +397,6 @@
+ distclean-compile:
+ -rm -f *.tab.c
+
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
+ @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
+ @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
+ @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
only in patch2:
unchanged:
---
adonthell-0.3.4.cvs.20050813.orig/debian/patches/01_work_around_bug_381456.diff
+++ adonthell-0.3.4.cvs.20050813/debian/patches/01_work_around_bug_381456.diff
@@ -0,0 +1,13 @@
+Index: adonthell-0.3.4.cvs.20050813/src/win_ttf.cc
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/win_ttf.cc 2006-08-10
20:50:05.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/win_ttf.cc 2006-08-10
20:50:18.000000000 +0200
+@@ -137,7 +137,7 @@
+ if (s == NULL) return *(glyphs[' ']);
+
+ image tmp (s, bg);
+- image shadow (TTF_RenderUNICODE_Solid (ttf, unichar, bg), white);
++ image shadow (TTF_RenderUNICODE_Shaded (ttf, unichar, bg, bg), white);
+ image *glph = new image (tmp.length(), height_, false);
+ glph->fillrect (0, 0, tmp.length()+1, height_+1, screen::trans_col(),
NULL);
+ shadow.draw (1, 1+height_-shadow.height(), 0, 0, shadow.length(),
shadow.height(), NULL, glph);
