Ubuntu
bzip2 package

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

  1. Natty (11.04)
  2. prop001
  3. Merge into natty
Proposed by Peter Pearse
Status: Needs review
Proposed branch: lp:~peter-pearse/ubuntu/natty/bzip2/prop001
Merge into: lp:ubuntu/natty/bzip2
Diff against target: 33 lines (+8/-1)
2 files modified
debian/changelog (+6/-0)
debian/rules (+2/-1)
To merge this branch: bzr merge lp:~peter-pearse/ubuntu/natty/bzip2/prop001
Reviewer Review Type Date Requested Status
Steve Langasek Pending
Review via email: mp+53276@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

13. By Peter Pearse

Use correct strip when cross building.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-02-20 15:55:37 +0000
3+++ debian/changelog 2011-03-14 16:37:33 +0000
4@@ -1,3 +1,9 @@
5+bzip2 (1.0.5-6ubuntu2) maverick; urgency=low
6+
7+ * Use correct strip when cross building
8+
9+ -- Peter Pearse <peter.pearse@linaro.org> Mon, 07 Mar 2011 14:19:54 +0000
10+
11 bzip2 (1.0.5-6ubuntu1) natty; urgency=low
12
13 * lib32bz2-1.0 only pre-depends on libc6-i386 on amd64; that
14
15=== modified file 'debian/rules'
16--- debian/rules 2010-09-21 10:33:49 +0000
17+++ debian/rules 2011-03-14 16:37:33 +0000
18@@ -16,13 +16,14 @@
19 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
20 CROSS=CC=$(DEB_HOST_GNU_TYPE)-gcc
21 CC=$(DEB_HOST_GNU_TYPE)-gcc
22+ DEBSTRIP = $(DEB_HOST_GNU_TYPE)-strip
23 else
24 CROSS=CC=gcc
25 CC=gcc
26+ DEBSTRIP = strip
27 endif
28
29 DEBCFLAGS:=
30-DEBSTRIP:=strip
31 WGET=wget
32 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
33 DEBCFLAGS += -g

Subscribers

People subscribed via source and target branches

to all changes: