[Fakeroot-commits] [SCM] Debian packaging of fakeroot branch, master, updated. debian/1.14.3-250-g046563e

[Clint Adams]

The following commit has been merged in the master branch:
commit 67d805a7155947308b5cffb6887d539917ff2735
Author: Clint Adams <clint at debian.org>
Date:   Thu May 16 21:09:27 2013 -0400

    Patch from Colin Watson to use appropriate strip command when cross-building.  closes: #693975.

diff --git a/debian/rules b/debian/rules
index 4bfd690..bf8857b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,11 @@
 
 DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+STRIP = strip
+else
 CONFARGS = --host=$(DEB_HOST_GNU_TYPE)
+STRIP = $(DEB_HOST_GNU_TYPE)-strip
 endif
 
 CFLAGS = -W -Wall -g
@@ -130,11 +133,11 @@ binary-arch: build checkroot
 		 debian/tmp/usr/share/man/sv/man1/fakeroot-tcp.1 \
 		 debian/tmp/usr/share/doc/fakeroot/changelog.Debian
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	strip --remove-section=.comment --remove-section=.note --strip-unneeded debian/tmp/${LIB_DIR}/libfakeroot/libfakeroot-sysv.so
-	strip --remove-section=.comment --remove-section=.note --strip-unneeded debian/tmp/${LIB_DIR}/libfakeroot/libfakeroot-tcp.so
-	strip --remove-section=.comment --remove-section=.note debian/tmp/usr/bin/faked-sysv
-	strip --remove-section=.comment --remove-section=.note debian/tmp/usr/bin/faked-tcp
-#	strip --strip-debug debian/tmp/${LIB_DIR}/libfakeroot.a
+	$(STRIP) --remove-section=.comment --remove-section=.note --strip-unneeded debian/tmp/${LIB_DIR}/libfakeroot/libfakeroot-sysv.so
+	$(STRIP) --remove-section=.comment --remove-section=.note --strip-unneeded debian/tmp/${LIB_DIR}/libfakeroot/libfakeroot-tcp.so
+	$(STRIP) --remove-section=.comment --remove-section=.note debian/tmp/usr/bin/faked-sysv
+	$(STRIP) --remove-section=.comment --remove-section=.note debian/tmp/usr/bin/faked-tcp
+#	$(STRIP) --strip-debug debian/tmp/${LIB_DIR}/libfakeroot.a
 endif
 	$(INSTALL_SCRIPT) debian/fakeroot.postrm debian/tmp/DEBIAN/postrm
 	$(INSTALL_SCRIPT) debian/fakeroot.prerm debian/tmp/DEBIAN/prerm

-- 
Debian packaging of fakeroot