DBus Menu

Merge lp:~cyphermox/libdbusmenu/12.10.3+14.04.20131125-0ubuntu2 into lp:libdbusmenu/14.04

  1. 12.10.3+14.04.20131125-0ubuntu2
  2. Merge into trunk.14.04
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Approved by: Francis Ginther
Approved revision: 466
Merged at revision: 466
Proposed branch: lp:~cyphermox/libdbusmenu/12.10.3+14.04.20131125-0ubuntu2
Merge into: lp:libdbusmenu/14.04
Diff against target: 30 lines (+11/-0)
2 files modified
debian/changelog (+6/-0)
debian/rules (+5/-0)
To merge this branch: bzr merge lp:~cyphermox/libdbusmenu/12.10.3+14.04.20131125-0ubuntu2
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ken VanDine Approve
Review via email: mp+201052@code.launchpad.net

Commit message

add missing changelog entry and changes for 12.10.3+14.04.20131125-0ubuntu2

Description of the change

add missing changelog entry and changes for 12.10.3+14.04.20131125-0ubuntu2

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

lgtm

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:466
http://jenkins.qa.ubuntu.com/job/libdbusmenu-ci/19/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-trusty-amd64-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-trusty-armhf-ci/6/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libdbusmenu-ci/19/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libdbusmenu-autolanding/20/
Executed test runs:
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3822/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-trusty-amd64-autolanding/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-trusty-armhf-autolanding/5/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

This failed due to an issue with the custom indicators pbuilder hooks and a strange build timeout. I've pushed a fix for the hooks and will retry.

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-11-25 03:55:53 +0000
3+++ debian/changelog 2014-01-09 17:41:33 +0000
4@@ -1,3 +1,9 @@
5+libdbusmenu (12.10.3+14.04.20131125-0ubuntu2) trusty; urgency=medium
6+
7+ * Do not build-depend on valgrind on ppc64el (not yet available).
8+
9+ -- Matthias Klose <doko@ubuntu.com> Wed, 18 Dec 2013 19:01:15 +0100
10+
11 libdbusmenu (12.10.3+14.04.20131125-0ubuntu1) trusty; urgency=low
12
13 [ Alistair Buxton ]
14
15=== modified file 'debian/rules'
16--- debian/rules 2013-01-09 07:13:09 +0000
17+++ debian/rules 2014-01-09 17:41:33 +0000
18@@ -35,7 +35,12 @@
19 override_dh_auto_test: $(FLAVORS:%=dotest-%)
20
21 dotest-%:
22+ifeq ($(DEB_HOST_ARCH),ppc64el)
23+ : # ignore the test results on $(DEB_HOST_ARCH)
24+ -xvfb-run -a dh_auto_test --builddirectory=builddir/$*
25+else
26 xvfb-run -a dh_auto_test --builddirectory=builddir/$*
27+endif
28
29 override_dh_install:
30 find debian/tmp -name \*.la -delete

Subscribers

People subscribed via source and target branches