Ubuntu
libx11 package

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

  1. Natty (11.04)
  2. prop001
  3. Merge into natty
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
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-03-22 06:08:21 +0000
3+++ debian/changelog 2011-04-07 14:02:24 +0000
4@@ -1,3 +1,9 @@
5+libx11 (2:1.4.1-5ubuntu3) natty; urgency=low
6+
7+ * Insert missing EOL
8+
9+ -- Peter Pearse <peter.pearse@linaro.org> Thu, 07 Apr 2011 13:08:05 +0000
10+
11 libx11 (2:1.4.1-5ubuntu2) natty; urgency=low
12
13 * FFe LP: #733501: build for multiarch.
14
15=== modified file 'debian/rules'
16--- debian/rules 2011-02-28 22:16:56 +0000
17+++ debian/rules 2011-04-07 14:02:24 +0000
18@@ -58,7 +58,7 @@
19 --prefix=/usr \
20 --mandir=\$${prefix}/share/man \
21 --infodir=\$${prefix}/share/info \
22- --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
23+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
24 --enable-specs \
25 --with-xmlto \
26 --without-fop \

Subscribers

People subscribed via source and target branches

to all changes: