diff -u pinfo-0.6.9/debian/changelog pinfo-0.6.9/debian/changelog
--- pinfo-0.6.9/debian/changelog
+++ pinfo-0.6.9/debian/changelog
@@ -1,9 +1,13 @@
-pinfo (0.6.9-5ubuntu1) oneiric; urgency=low
+pinfo (0.6.9-5.1) unstable; urgency=low
 
-  * Fix link order to list libraries after the objects that require them
-    (LP: #770803).
+  * NMU
+  * Add a path to term.h for libncursesw5. Closes: #646486
+  * Fix link order to list libraries after the objects that require them.
+    Patch from Colin Watson <cjwatson@ubuntu.com> Closes: #641287
+  * Add build-arch and build-indep targets to debian/rules, just calling
+    "build" for now.
 
- -- Colin Watson <cjwatson@ubuntu.com>  Mon, 12 Sep 2011 13:44:34 +0100
+ -- Steve McIntyre <steve.mcintyre@linaro.org>  Tue, 13 Dec 2011 17:05:43 +0000
 
 pinfo (0.6.9-5) unstable; urgency=low
 
diff -u pinfo-0.6.9/debian/rules pinfo-0.6.9/debian/rules
--- pinfo-0.6.9/debian/rules
+++ pinfo-0.6.9/debian/rules
@@ -60,7 +60,10 @@
 
 	touch patch-stamp
 
-build: build-stamp
+build-arch: build-stamp
+build-indep: build-stamp
+
+build: build-arch build-indep
 build-stamp: patch-stamp
 	dh_testdir
 	cd $(BUILDDIR) && ./configure $(config_flags)
diff -u pinfo-0.6.9/debian/control pinfo-0.6.9/debian/control
--- pinfo-0.6.9/debian/control
+++ pinfo-0.6.9/debian/control
@@ -1,8 +1,7 @@
 Source: pinfo
 Section: doc
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Bas Zoetekouw <bas@debian.org>
+Maintainer: Bas Zoetekouw <bas@debian.org>
 Standards-Version: 3.8.3
 Build-Depends: debhelper (>=5), dpatch, bzip2, gettext, libreadline-dev, libncursesw5-dev, texinfo, install-info, autotools-dev
 Homepage: http://pinfo.alioth.debian.org/
diff -u pinfo-0.6.9/debian/patches/04_link_order.dpatch pinfo-0.6.9/debian/patches/04_link_order.dpatch
--- pinfo-0.6.9/debian/patches/04_link_order.dpatch
+++ pinfo-0.6.9/debian/patches/04_link_order.dpatch
@@ -8,50 +8,50 @@
 
---- pinfo-0.6.9/macros/curses.m4	2006-03-09 19:44:38.000000000 +0000
-+++ pinfo-0.6.9/macros/curses.m4	2011-09-12 13:36:35.000000000 +0100
+--- pinfo-0.6.9/macros/curses.m4       2006-03-09 19:44:38.000000000 +0000
++++ pinfo-0.6.9/macros/curses.m4       2011-09-12 13:36:35.000000000 +0100
 @@ -254,11 +254,11 @@
  dnl
  AC_DEFUN([AC_CHECK_CURSES_COMPILE], [
- 
+
 -	dnl save CFLAGS and LDFLAGS and set new ones
 +	dnl save CFLAGS and LIBS and set new ones
- 	CFLAGS_OLD=$CFLAGS
- 	CFLAGS="$CFLAGS $curses_includes"
+	CFLAGS_OLD=$CFLAGS
+	CFLAGS="$CFLAGS $curses_includes"
 -	LDFLAGS_OLD=$LDFLAGS
 -	LDFLAGS="$LDFLAGS $curses_libs"
 +	LIBS_OLD=$LIBS
 +	LIBS="$LIBS $curses_libs"
- 
- 	dnl do the compile test 
- 	AC_MSG_CHECKING([if curses is usable])
+
+	dnl do the compile test
+	AC_MSG_CHECKING([if curses is usable])
 @@ -288,7 +288,7 @@
- 
- 	dnl restore variables
- 	CFLAGS=$CFLAGS_OLD
+
+	dnl restore variables
+	CFLAGS=$CFLAGS_OLD
 -	LDFLAGS=$LDFLAGS_OLD
 +	LIBS=$LIBS_OLD
- 
+
  ])
- 
---- pinfo-0.6.9/configure	2006-03-16 16:27:26.000000000 +0000
-+++ pinfo-0.6.9/configure	2011-09-12 13:37:12.000000000 +0100
+
+--- pinfo-0.6.9/configure      2006-03-16 16:27:26.000000000 +0000
++++ pinfo-0.6.9/configure      2011-09-12 13:37:12.000000000 +0100
 @@ -10139,8 +10139,8 @@
- 
- 		CFLAGS_OLD=$CFLAGS
- 	CFLAGS="$CFLAGS $curses_includes"
+
+		CFLAGS_OLD=$CFLAGS
+	CFLAGS="$CFLAGS $curses_includes"
 -	LDFLAGS_OLD=$LDFLAGS
 -	LDFLAGS="$LDFLAGS $curses_libs"
 +	LIBS_OLD=$LIBS
 +	LIBS="$LIBS $curses_libs"
- 
- 		echo "$as_me:$LINENO: checking if curses is usable" >&5
+
+		echo "$as_me:$LINENO: checking if curses is usable" >&5
  echo $ECHO_N "checking if curses is usable... $ECHO_C" >&6
 @@ -10211,7 +10211,7 @@
-       conftest$ac_exeext conftest.$ac_ext
- 
- 		CFLAGS=$CFLAGS_OLD
+	conftest$ac_exeext conftest.$ac_ext
+
+		CFLAGS=$CFLAGS_OLD
 -	LDFLAGS=$LDFLAGS_OLD
 +	LIBS=$LIBS_OLD
- 
- 
- 	else
+
+
+	else
 
diff -u pinfo-0.6.9/debian/patches/00list pinfo-0.6.9/debian/patches/00list
--- pinfo-0.6.9/debian/patches/00list
+++ pinfo-0.6.9/debian/patches/00list
@@ -4,0 +5 @@
+05_term.h.dpatch
only in patch2:
unchanged:
--- pinfo-0.6.9.orig/debian/patches/05_term.h.dpatch
+++ pinfo-0.6.9/debian/patches/05_term.h.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_term.h.dpatch by Steve McIntyre <steve.mcintyre@linaro.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: ncursesw5 include file path change.
+
+@DPATCH@
+
+--- pinfo-0.6.9.old/src/utils.c	2006-03-16 14:14:30.000000000 +0000
++++ pinfo-0.6.9/src/utils.c	2011-12-13 16:48:17.783029574 +0000
+@@ -50,7 +50,7 @@
+ #ifdef HAS_READLINE
+ #include <readline/readline.h>
+ #include <readline/history.h>
+-#include <term.h>
++#include <ncursesw/term.h>
+ /* HAS_READLINE */
+ #endif
+