diff -Nru nacl-20110221/debian/changelog nacl-20110221/debian/changelog --- nacl-20110221/debian/changelog 2012-04-05 07:31:38.000000000 +0000 +++ nacl-20110221/debian/changelog 2012-09-21 08:44:48.000000000 +0000 @@ -1,3 +1,13 @@ +nacl (20110221-4.1) unstable; urgency=low + + * Modify the build system to echo stuff to standard output during the build + rather than only at the end. Hopefully this should prevent the timeout + on mips. + * Add some tests for the state of /sys before starting the build to help + debug failures related to being unable to determine CPU frequency + + -- Peter Michael Green Fri, 21 Sep 2012 08:43:21 +0000 + nacl (20110221-4) unstable; urgency=low * Move to unstable. diff -Nru nacl-20110221/debian/patches/output-while-building nacl-20110221/debian/patches/output-while-building --- nacl-20110221/debian/patches/output-while-building 1970-01-01 00:00:00.000000000 +0000 +++ nacl-20110221/debian/patches/output-while-building 2012-09-21 08:47:59.000000000 +0000 @@ -0,0 +1,32 @@ +Description: output to standard output while building. + The upstream build system puts all output in a log file rather than to standard + output. This can cause build timeouts on slow architectures and if the build + truely hangs makes it difficult to determine where it hung. Modify the build + system to output to standard output as it goes along. + +Author: Peter Michael Green + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- nacl-20110221.orig/do ++++ nacl-20110221/do +@@ -38,7 +38,7 @@ mkdir -p "$bin" + mkdir -p "$lib" + mkdir -p "$include" + +-exec >"$top/log" ++exec | tee "$top/log" + exec 2>&1 + exec 5>"$top/data" + exec debian/nacl-sha256.1 @@ -28,7 +35,6 @@ docbook-to-man debian/curvecpclient.sgml > debian/curvecpclient.1 docbook-to-man debian/curvecpmakekey.sgml > debian/curvecpmakekey.1 docbook-to-man debian/curvecpprintkey.sgml > debian/curvecpprintkey.1 - cat $(CURDIR)/build/$(SHORTHOSTNAME)/log touch $@ clean: