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

[Dimitri John Ledkov]

seb said so.

[Sebastien Bacher (seb128)]

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:480
http://jenkins.qa.ubuntu.com/job/libdbusmenu-ci/29/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-wily-amd64-ci/1
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-wily-armhf-ci/1/console

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

review: Needs Fixing (continuous-integration)

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.

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-10 21:56:13 +0000
+++ debian/changelog	2015-12-07 12:51:44 +0000
@@ -1,3 +1,10 @@
+libdbusmenu (12.10.3+15.04.20150410.2-0ubuntu2) xenial; urgency=high
+
+  * Disable test-json-instruction, hangs on buildds, see launchpad bug
+    1429291.
+
+ -- Dimitri John Ledkov <[e-mail]>  Mon, 07 Dec 2015 10:13:22 +0000
+
 libdbusmenu (12.10.3+15.04.20150410.2-0ubuntu1) vivid; urgency=medium
 
   [ CI Train Bot ]
 
=== modified file 'debian/control'
--- debian/control	2014-10-31 11:21:33 +0000
+++ debian/control	2015-12-07 12:51:44 +0000
@@ -29,8 +29,8 @@
 # If you aren't a member of ~dbusmenu-team but need to upload
 # packaging changes, just go ahead.  ~dbusmenu-team will notice
 # and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk.13.04
-Vcs-Browser: https://bazaar.launchpad.net/~dbusmenu-team/dbusmenu/trunk.13.04/files
+Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk.15.10
+Vcs-Browser: https://bazaar.launchpad.net/~dbusmenu-team/dbusmenu/trunk.15.10/files
 
 Package: libdbusmenu-glib4
 Section: libs
 
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2015-04-09 16:44:35 +0000
+++ tests/Makefile.am	2015-12-07 12:51:44 +0000
@@ -17,8 +17,9 @@
 if WANT_DBUSMENUDUMPER
 if HAVE_VALGRIND
 TESTS += \
-	test-json \
-	test-json-instruction
+	test-json
+# Hangs see https://bugs.launchpad.net/ubuntu/+source/libdbusmenu/+bug/1429291
+#	test-json-instruction
 endif
 endif