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

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

Unmerged revisions

49. By Peter Pearse

Insert missing EOL.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-03-22 06:08:21 +0000
+++ debian/changelog 2011-04-07 14:02:24 +0000
@@ -1,3 +1,9 @@
1libx11 (2:1.4.1-5ubuntu3) natty; urgency=low
2
3 * Insert missing EOL
4
5 -- Peter Pearse <peter.pearse@linaro.org> Thu, 07 Apr 2011 13:08:05 +0000
6
1libx11 (2:1.4.1-5ubuntu2) natty; urgency=low7libx11 (2:1.4.1-5ubuntu2) natty; urgency=low
28
3 * FFe LP: #733501: build for multiarch.9 * FFe LP: #733501: build for multiarch.
410
=== modified file 'debian/rules'
--- debian/rules 2011-02-28 22:16:56 +0000
+++ debian/rules 2011-04-07 14:02:24 +0000
@@ -58,7 +58,7 @@
58 --prefix=/usr \58 --prefix=/usr \
59 --mandir=\$${prefix}/share/man \59 --mandir=\$${prefix}/share/man \
60 --infodir=\$${prefix}/share/info \60 --infodir=\$${prefix}/share/info \
61 --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)61 --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
62 --enable-specs \62 --enable-specs \
63 --with-xmlto \63 --with-xmlto \
64 --without-fop \64 --without-fop \

Subscribers

People subscribed via source and target branches

to all changes: