diff -Nru python2.5-2.5.6/debian/changelog python2.5-2.5.6/debian/changelog
--- python2.5-2.5.6/debian/changelog	2014-10-11 00:09:07.000000000 +0000
+++ python2.5-2.5.6/debian/changelog	2014-10-21 22:06:52.000000000 +0000
@@ -1,3 +1,16 @@
+python2.5 (2.5.6-9+trusty1) trusty; urgency=medium
+
+  * Imported from Precise package.
+  * Properly build with readline 6.3.
+
+ -- Felix Krull <f_krull@gmx.de>  Wed, 22 Oct 2014 00:06:35 +0200
+
+python2.5 (2.5.6-9+precise1) precise; urgency=medium
+
+  * Link to shared libffi.
+
+ -- Felix Krull <f_krull@gmx.de>  Tue, 21 Oct 2014 23:34:04 +0200
+
 python2.5 (2.5.6-8+trusty1) trusty; urgency=medium
 
   * Imported from Precise package.
diff -Nru python2.5-2.5.6/debian/control python2.5-2.5.6/debian/control
--- python2.5-2.5.6/debian/control	2014-10-10 23:02:54.000000000 +0000
+++ python2.5-2.5.6/debian/control	2014-10-21 22:06:01.000000000 +0000
@@ -19,6 +19,7 @@
 Vcs-Hg: https://bitbucket.org/fk/deadsnakes-python2.5
 X-Original-Vcs-Browser: https://code.launchpad.net/~doko/python/pkg2.5
 X-Original-Vcs-Bzr: http://bazaar.launchpad.net/~doko/python/pkg2.5
+XS-Testsuite: autopkgtest
 
 Package: python2.5
 Architecture: any
diff -Nru python2.5-2.5.6/debian/control.in python2.5-2.5.6/debian/control.in
--- python2.5-2.5.6/debian/control.in	2014-10-10 23:02:54.000000000 +0000
+++ python2.5-2.5.6/debian/control.in	2014-10-21 22:06:01.000000000 +0000
@@ -19,6 +19,7 @@
 Vcs-Hg: https://bitbucket.org/fk/deadsnakes-@PVER@
 X-Original-Vcs-Browser: https://code.launchpad.net/~doko/python/pkg@VER@
 X-Original-Vcs-Bzr: http://bazaar.launchpad.net/~doko/python/pkg@VER@
+XS-Testsuite: autopkgtest
 
 Package: @PVER@
 Architecture: any
diff -Nru python2.5-2.5.6/debian/patches/libffi-shared.diff python2.5-2.5.6/debian/patches/libffi-shared.diff
--- python2.5-2.5.6/debian/patches/libffi-shared.diff	1970-01-01 00:00:00.000000000 +0000
+++ python2.5-2.5.6/debian/patches/libffi-shared.diff	2014-10-21 22:06:01.000000000 +0000
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -1530,7 +1530,7 @@
+                     break
+         ffi_lib = None
+         if ffi_inc is not None:
+-            for lib_name in ('ffi_convenience', 'ffi_pic', 'ffi'):
++            for lib_name in ('ffi', 'ffi_convenience', 'ffi_pic', 'ffi'):
+                 if (self.compiler.find_library_file(lib_dirs, lib_name)):
+                     ffi_lib = lib_name
+                     break
diff -Nru python2.5-2.5.6/debian/patches/readline-6.3-compat.diff python2.5-2.5.6/debian/patches/readline-6.3-compat.diff
--- python2.5-2.5.6/debian/patches/readline-6.3-compat.diff	1970-01-01 00:00:00.000000000 +0000
+++ python2.5-2.5.6/debian/patches/readline-6.3-compat.diff	2014-10-21 22:06:01.000000000 +0000
@@ -0,0 +1,33 @@
+--- a/Modules/readline.c
++++ b/Modules/readline.c
+@@ -712,12 +712,27 @@
+ 	rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
+ 	rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
+ 	/* Set our hook functions */
+-	rl_startup_hook = (Function *)on_startup_hook;
++	rl_startup_hook =
++#if defined(_RL_FUNCTION_TYPEDEF)
++		(rl_hook_func_t *)on_startup_hook;
++#else
++		(Function *)on_startup_hook;
++#endif
+ #ifdef HAVE_RL_PRE_INPUT_HOOK
+-	rl_pre_input_hook = (Function *)on_pre_input_hook;
++	rl_pre_input_hook =
++#if defined(_RL_FUNCTION_TYPEDEF)
++		(rl_hook_func_t *)on_pre_input_hook;
++#else
++		(Function *)on_pre_input_hook;
++#endif
+ #endif
+ 	/* Set our completion function */
+-	rl_attempted_completion_function = (CPPFunction *)flex_complete;
++	rl_attempted_completion_function =
++#if defined(_RL_FUNCTION_TYPEDEF)
++		(rl_completion_func_t *)flex_complete;
++#else
++		(CPPFunction *)flex_complete;
++#endif
+ 	/* Set Python word break characters */
+ 	rl_completer_word_break_characters =
+ 		strdup(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?");
diff -Nru python2.5-2.5.6/debian/patches/series python2.5-2.5.6/debian/patches/series
--- python2.5-2.5.6/debian/patches/series	2014-10-11 00:05:29.000000000 +0000
+++ python2.5-2.5.6/debian/patches/series	2014-10-21 22:06:01.000000000 +0000
@@ -58,3 +58,6 @@
 deadsnakes-force-info-docs.diff
 deadsnakes-platform-linux2.diff
 ext-no-libpython-link.diff
+
+libffi-shared.diff
+readline-6.3-compat.diff
diff -Nru python2.5-2.5.6/debian/rules python2.5-2.5.6/debian/rules
--- python2.5-2.5.6/debian/rules	2014-10-11 00:05:29.000000000 +0000
+++ python2.5-2.5.6/debian/rules	2014-10-21 22:06:01.000000000 +0000
@@ -63,7 +63,7 @@
 
 MIN_MODS := $(shell awk '/^  / && $$2 == "module" { print $$1 }' \
 		debian/PVER-minimal.README.Debian.in)
-MIN_EXTS := $(shell awk '/^  / && $$2 == "extension" { print $$1 }' \
+MIN_EXTS := $(shell awk '/^  / && $$2 ~ /^extension/ { print $$1 }' \
 		debian/PVER-minimal.README.Debian.in)
 MIN_BUILTINS := $(shell awk '/^  / && $$2 == "builtin" { print $$1 }' \
 		debian/PVER-minimal.README.Debian.in)
@@ -483,9 +483,8 @@
 		mintest/lib/
 	cp -a $(foreach i,$(MIN_PACKAGES),Lib/$(i)) \
 		mintest/lib/
-	: # Don't install minimal extensions since those have been built statically.
-#	cp -p $(foreach i,$(MIN_EXTS),$(buildd_static)/build/lib*/$(i).so) \
-#		mintest/dynlib/
+	cp -p $(wildcard $(foreach i,$(MIN_EXTS),$(buildd_static)/build/lib*/$(i).*.so)) \
+		mintest/dynlib/
 	cp -p Lib/unittest.py mintest/lib/
 	cp -pr Lib/test mintest/lib/
 	cp -pr Lib mintest/all-lib
diff -Nru python2.5-2.5.6/debian/tests/check-ndbm.in python2.5-2.5.6/debian/tests/check-ndbm.in
--- python2.5-2.5.6/debian/tests/check-ndbm.in	1970-01-01 00:00:00.000000000 +0000
+++ python2.5-2.5.6/debian/tests/check-ndbm.in	2014-10-21 22:06:01.000000000 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+
+DBM=/usr/lib/@PVER@/lib-dynload/dbm.so
+test -e $DBM && echo "$DBM exists"
+ldd $DBM | grep -q libdb
+@PVER@ -c "import dbm"
diff -Nru python2.5-2.5.6/debian/tests/check-various-modules.in python2.5-2.5.6/debian/tests/check-various-modules.in
--- python2.5-2.5.6/debian/tests/check-various-modules.in	1970-01-01 00:00:00.000000000 +0000
+++ python2.5-2.5.6/debian/tests/check-various-modules.in	2014-10-21 22:06:01.000000000 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+
+MODS="_ssl readline curses gdbm Tkinter test.test_support bsddb"
+for mod in $MODS; do
+  @PVER@ -c "import $mod"
+done
diff -Nru python2.5-2.5.6/debian/tests/control.in python2.5-2.5.6/debian/tests/control.in
--- python2.5-2.5.6/debian/tests/control.in	1970-01-01 00:00:00.000000000 +0000
+++ python2.5-2.5.6/debian/tests/control.in	2014-10-21 22:06:01.000000000 +0000
@@ -0,0 +1,11 @@
+Tests: regr6-curses-newpad
+Depends: @PVER@
+
+Tests: check-various-modules
+Depends: @PVER@, @PVER@-gdbm, @PVER@-tk
+
+Tests: check-ndbm
+Depends: libc-bin, @PVER@
+
+Tests: regr20-check-dynamic-ctypes
+Depends: libc-bin, @PVER@, @PVER@-dbg
diff -Nru python2.5-2.5.6/debian/tests/regr20-check-dynamic-ctypes.in python2.5-2.5.6/debian/tests/regr20-check-dynamic-ctypes.in
--- python2.5-2.5.6/debian/tests/regr20-check-dynamic-ctypes.in	1970-01-01 00:00:00.000000000 +0000
+++ python2.5-2.5.6/debian/tests/regr20-check-dynamic-ctypes.in	2014-10-21 22:06:01.000000000 +0000
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -e
+
+CTYPES=/usr/lib/@PVER@/lib-dynload/_ctypes.so
+CTYPES_DEBUG=/usr/lib/@PVER@/lib-dynload/_ctypes_d.so
+
+LIBFFI=libffi.so.6
+
+# regular
+test -e $CTYPES
+ldd $CTYPES | grep -q $LIBFFI
+
+# debug
+test -e $CTYPES_DEBUG
+ldd $CTYPES_DEBUG | grep -q $LIBFFI
diff -Nru python2.5-2.5.6/debian/tests/regr6-curses-newpad.in python2.5-2.5.6/debian/tests/regr6-curses-newpad.in
--- python2.5-2.5.6/debian/tests/regr6-curses-newpad.in	1970-01-01 00:00:00.000000000 +0000
+++ python2.5-2.5.6/debian/tests/regr6-curses-newpad.in	2014-10-21 22:06:01.000000000 +0000
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+cat > $ADTTMP/curses-newpad-test.py <<EOF
+import curses
+screen = curses.initscr()
+pad = curses.newpad(10, 10)
+pad.addstr("test")
+size = screen.getmaxyx()
+pad.refresh(0, 0, 0, 0, size[0] - 1, size[1] - 1)
+EOF
+
+@PVER@ $ADTTMP/curses-newpad-test.py > /dev/null