DBus Menu

Merge lp:~xnox/libdbusmenu/xnox-non-ci into lp:libdbusmenu/15.10

  1. xnox-non-ci
  2. Merge into trunk.15.10
Proposed by Dimitri John Ledkov on 2015-12-07
Status: Approved
Approved by: Sebastien Bacher on 2015-12-07
Approved revision: 480
Proposed branch: lp:~xnox/libdbusmenu/xnox-non-ci
Merge into: lp:libdbusmenu/15.10
Diff against target: 44 lines (+12/-4)
3 files modified
debian/changelog (+7/-0)
debian/control (+2/-2)
tests/Makefile.am (+3/-2)
To merge this branch: bzr merge lp:~xnox/libdbusmenu/xnox-non-ci
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2015-12-07
Sebastien Bacher 2015-12-07 Approve on 2015-12-07
Review via email: mp+279767@code.launchpad.net

Description of the Change

seb said so.

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

thanks, feel free to push directly to the vcs since that's what is in distro

review: Approve
Reply
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Reply

Unmerged revisions

480. By Dimitri John Ledkov on 2015-12-07

import changelog.

479. By Dimitri John Ledkov on 2015-12-07

Fix Vcs-* fields to point somewhere more recent.

478. By Dimitri John Ledkov on 2015-12-07

Disable test-json-instruction, hangs on buildds, see launchpad bug 1429291.

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 2015-04-10 21:56:13 +0000
3+++ debian/changelog 2015-12-07 12:51:44 +0000
4@@ -1,3 +1,10 @@
5+libdbusmenu (12.10.3+15.04.20150410.2-0ubuntu2) xenial; urgency=high
6+
7+ * Disable test-json-instruction, hangs on buildds, see launchpad bug
8+ 1429291.
9+
10+ -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 07 Dec 2015 10:13:22 +0000
11+
12 libdbusmenu (12.10.3+15.04.20150410.2-0ubuntu1) vivid; urgency=medium
13
14 [ CI Train Bot ]
15
16=== modified file 'debian/control'
17--- debian/control 2014-10-31 11:21:33 +0000
18+++ debian/control 2015-12-07 12:51:44 +0000
19@@ -29,8 +29,8 @@
20 # If you aren't a member of ~dbusmenu-team but need to upload
21 # packaging changes, just go ahead. ~dbusmenu-team will notice
22 # and sync up the code again.
23-Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk.13.04
24-Vcs-Browser: https://bazaar.launchpad.net/~dbusmenu-team/dbusmenu/trunk.13.04/files
25+Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk.15.10
26+Vcs-Browser: https://bazaar.launchpad.net/~dbusmenu-team/dbusmenu/trunk.15.10/files
27
28 Package: libdbusmenu-glib4
29 Section: libs
30
31=== modified file 'tests/Makefile.am'
32--- tests/Makefile.am 2015-04-09 16:44:35 +0000
33+++ tests/Makefile.am 2015-12-07 12:51:44 +0000
34@@ -17,8 +17,9 @@
35 if WANT_DBUSMENUDUMPER
36 if HAVE_VALGRIND
37 TESTS += \
38- test-json \
39- test-json-instruction
40+ test-json
41+# Hangs see https://bugs.launchpad.net/ubuntu/+source/libdbusmenu/+bug/1429291
42+# test-json-instruction
43 endif
44 endif
45

Subscribers

People subscribed via source and target branches