Attached
Cheers,
--
Steve McIntyre [email protected]
<http://www.linaro.org/> Linaro.org | Open source software for ARM SoCs
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/changelog pinfo-0.6.9/debian/changelog
--- pinfo-0.6.9/debian/changelog
+++ pinfo-0.6.9/debian/changelog
@@ -1,3 +1,14 @@
+pinfo (0.6.9-5.1) unstable; urgency=low
+
+ * 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 <[email protected]> Closes: #641287
+ * Add build-arch and build-indep targets to debian/rules, just calling
+ "build" for now.
+
+ -- Steve McIntyre <[email protected]> Tue, 13 Dec 2011 17:05:43 +0000
+
pinfo (0.6.9-5) unstable; urgency=low
* Build-dep on libreadline-dev instead of libreadline5-dev
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
@@ -3,0 +4,2 @@
+04_link_order.dpatch
+05_term.h.dpatch
only in patch2:
unchanged:
--- pinfo-0.6.9.orig/debian/patches/04_link_order.dpatch
+++ pinfo-0.6.9/debian/patches/04_link_order.dpatch
@@ -0,0 +1,57 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_link_order.dpatch by Colin Watson <[email protected]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix link order to list C objects before the libraries they require.
+
+@DPATCH@
+
+--- 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"
+- 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])
+@@ -288,7 +288,7 @@
+
+ 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
+@@ -10139,8 +10139,8 @@
+
+ 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 $ECHO_N "checking if curses is usable... $ECHO_C" >&6
+@@ -10211,7 +10211,7 @@
+ conftest$ac_exeext conftest.$ac_ext
+
+ CFLAGS=$CFLAGS_OLD
+- LDFLAGS=$LDFLAGS_OLD
++ LIBS=$LIBS_OLD
+
+
+ else
+
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 <[email protected]>
+##
+## 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
+
