=== modified file 'debian/changelog' --- debian/changelog 2012-02-15 20:27:06 +0000 +++ debian/changelog 2012-03-26 12:31:44 +0000 @@ -1,3 +1,9 @@ +debianutils (4.2.1ubuntu2) precise; urgency=low + + * Ensure correct strip is called when cross-building (LP: #962997) + + -- Marcin Juszkiewicz Fri, 23 Mar 2012 12:21:47 +0100 + debianutils (4.2.1ubuntu1) precise; urgency=low * Merge from Debian testing. (closes: LP: #933051) === modified file 'debian/rules' --- debian/rules 2011-12-01 20:52:56 +0000 +++ debian/rules 2012-03-26 12:31:55 +0000 @@ -12,8 +12,10 @@ INSTALL_DIR = $(INSTALL) -p -d -o ro DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +CROSS = ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) CONFARGS = --host=$(DEB_HOST_GNU_TYPE) +CROSS = $(DEB_HOST_GNU_TYPE)- endif CFLAGS := $(shell dpkg-buildflags --get CFLAGS) @@ -63,7 +65,7 @@ binary-arch: checkroot build debian/tmp/bin/ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - strip --remove-section=.comment --remove-section=.note \ + $(CROSS)strip --remove-section=.comment --remove-section=.note \ debian/tmp/bin/run-parts \ debian/tmp/bin/tempfile \ debian/tmp/usr/bin/ischroot