Merge lp:~peter-pearse/ubuntu/natty/bzip2/prop001 into lp:ubuntu/natty/bzip2

[Peter Pearse]

Unmerged revisions

13. By Peter Pearse on 2011-03-07

Use correct strip when cross building.

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-20 15:55:37 +0000
+++ debian/changelog	2011-03-14 16:37:33 +0000
@@ -1,3 +1,9 @@
+bzip2 (1.0.5-6ubuntu2) maverick; urgency=low
+
+  * Use correct strip when cross building
+
+ -- Peter Pearse <[e-mail]>  Mon, 07 Mar 2011 14:19:54 +0000
+
 bzip2 (1.0.5-6ubuntu1) natty; urgency=low
 
   * lib32bz2-1.0 only pre-depends on libc6-i386 on amd64; that
 
=== modified file 'debian/rules'
--- debian/rules	2010-09-21 10:33:49 +0000
+++ debian/rules	2011-03-14 16:37:33 +0000
@@ -16,13 +16,14 @@
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
         CROSS=CC=$(DEB_HOST_GNU_TYPE)-gcc
         CC=$(DEB_HOST_GNU_TYPE)-gcc
+        DEBSTRIP = $(DEB_HOST_GNU_TYPE)-strip
 else
         CROSS=CC=gcc
         CC=gcc
+        DEBSTRIP = strip
 endif
 
 DEBCFLAGS:=
-DEBSTRIP:=strip
 WGET=wget
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 DEBCFLAGS += -g