Merge lp:~xnox/libdbusmenu/fix-arm64 into lp:libdbusmenu/13.10

Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Ted Gould
Approved revision: 460
Merged at revision: 460
Proposed branch: lp:~xnox/libdbusmenu/fix-arm64
Merge into: lp:libdbusmenu/13.10
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~xnox/libdbusmenu/fix-arm64
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ted Gould (community) Approve
Review via email: mp+190967@code.launchpad.net

Commit message

Do not build-depend on valgrind on AArch64 (not yet available).

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

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 2013-09-13 15:16:38 +0000
3+++ debian/changelog 2013-10-14 14:08:08 +0000
4@@ -1,3 +1,10 @@
5+libdbusmenu (12.10.3+13.10.20130913-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * Do not build-depend on valgrind on AArch64 (not yet available). (LP:
8+ #1239473)
9+
10+ -- Matthias Klose <doko@ubuntu.com> Mon, 14 Oct 2013 01:30:44 +0200
11+
12 libdbusmenu (12.10.3+13.10.20130913-0ubuntu1) saucy; urgency=low
13
14 [ Ted Gould ]
15
16=== modified file 'debian/control'
17--- debian/control 2013-07-22 05:15:14 +0000
18+++ debian/control 2013-10-14 14:08:08 +0000
19@@ -10,7 +10,7 @@
20 libtool,
21 intltool,
22 gtk-doc-tools,
23- valgrind,
24+ valgrind [!arm64],
25 dbus-test-runner,
26 xvfb,
27 libglib2.0-dev (>= 2.35.4),

Subscribers

People subscribed via source and target branches