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,18 @@
+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 <themuso@ubuntu.com>  Sat, 18 Nov 2006 08:57:10 +1100
+
+adonthell (0.3.4.cvs.20050813-2.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix SDL include statement in src/py_adonthell.i.
+
+ -- Mohammed Adnène Trojette <adn+deb@diwi.org>  Wed, 20 Sep 2006 00:27:19 +0200
+
 adonthell (0.3.4.cvs.20050813-2.2ubuntu1) edgy; urgency=low
 
   * Merge from debian unstable.
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
@@ -119,15 +119,6 @@
  #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-2.2ubuntu1/src/py_adonthell_wrap.cc
 ===================================================================
 --- adonthell-0.3.4.cvs.20050813-2.2ubuntu1.orig/src/py_adonthell_wrap.cc	2006-08-13 01:24:03.000000000 +0200