diff -Nru bmake-20131001/debian/changelog bmake-20131001/debian/changelog --- bmake-20131001/debian/changelog 2014-01-04 15:21:44.000000000 +0000 +++ bmake-20131001/debian/changelog 2014-01-18 02:17:07.000000000 +0000 @@ -1,3 +1,10 @@ +bmake (20131001-4) unstable; urgency=low + + * Don't include OS prefix in MACHINE_ARCH (Closes: #735856, patch by + Robert Millan). + + -- Andrew Shadura Sat, 18 Jan 2014 03:17:05 +0100 + bmake (20131001-3) unstable; urgency=low * Add patch to fix segfault in hash.c, drop old var.c patch. diff -Nru bmake-20131001/debian/rules bmake-20131001/debian/rules --- bmake-20131001/debian/rules 2013-12-31 16:24:55.000000000 +0000 +++ bmake-20131001/debian/rules 2014-01-18 02:13:16.000000000 +0000 @@ -2,7 +2,7 @@ #export DH_VERBOSE=1 -ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH) +ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) MULTIARCH=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) MAKE_VERSION=$(shell sed -n '/^MAKE_VERSION=/s,.*=[^0-9]*,,p' Makefile) CFLAGS=$(shell dpkg-buildflags --get CFLAGS) \