DBus Menu

Merge lp:~nteodosio/libdbusmenu/trunk into lp:libdbusmenu

  1. trunk
  2. Merge into trunk.16.10
Proposed by Nathan Teodosio
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: 498
Merged at revision: 497
Proposed branch: lp:~nteodosio/libdbusmenu/trunk
Merge into: lp:libdbusmenu
Diff against target: 62 lines (+33/-1)
3 files modified
debian/changelog (+31/-0)
debian/control (+1/-1)
tests/Makefile.am (+1/-0)
To merge this branch: bzr merge lp:~nteodosio/libdbusmenu/trunk
Reviewer Review Type Date Requested Status
Dmitry Shachnev Needs Fixing
Review via email: mp+430680@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Nathan Teodosio (nteodosio) wrote :

Fixes failing test[1].

[1]: https://launchpadlibrarian.net/625439356/buildlog_ubuntu-kinetic-armhf.libdbusmenu_16.04.1+18.10.20180917-0ubuntu8_BUILDING.txt.gz

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

I get this error when building from your branch:

/bin/bash: line 1: 2.73.3)/d": No such file or directory

See full log here:

https://launchpadlibrarian.net/626145797/buildlog_ubuntu-kinetic-amd64.libdbusmenu_16.04.1+22.10.20220928-0ubuntu1_BUILDING.txt.gz

review: Needs Fixing
lp:~nteodosio/libdbusmenu/trunk updated
497. By Nathan Teodosio

Incorporate changelog from previous releases.

498. By Nathan Teodosio

Prevent test-json from failing because of warning.

Revision history for this message
Nathan Teodosio (nteodosio) wrote :

Sorry, I must have worked on the Makefile and forgotten to update
Makefile.am.

This one was tested with dpkg-buildpackage -b.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2020-01-13 12:53:02 +0000
+++ debian/changelog 2022-09-28 22:01:28 +0000
@@ -1,3 +1,34 @@
1libdbusmenu (16.04.1+18.10.20180917-0ubuntu9) UNRELEASED; urgency=medium
2
3 * Prevent test-json from failing because of "Using cross-namespace
4 EXTERNAL authentication" warning (LP: #1991138).
5
6 -- Nathan Pratta Teodosio <nathan.teodosio@canonical.com> Wed, 28 Sep 2022 13:44:33 -0300
7
8libdbusmenu (16.04.1+18.10.20180917-0ubuntu8) jammy; urgency=high
9
10 * No change rebuild for ppc64el baseline bump.
11
12 -- Julian Andres Klode <juliank@ubuntu.com> Thu, 24 Mar 2022 13:10:53 +0100
13
14libdbusmenu (16.04.1+18.10.20180917-0ubuntu7) impish; urgency=medium
15
16 * No-change rebuild to build packages with zstd compression.
17
18 -- Matthias Klose <doko@ubuntu.com> Thu, 07 Oct 2021 12:14:52 +0200
19
20libdbusmenu (16.04.1+18.10.20180917-0ubuntu6) focal; urgency=medium
21
22 * Disable valgrind on riscv64. It's not there yet.
23
24 -- William Grant <wgrant@ubuntu.com> Mon, 06 Apr 2020 15:54:52 +1000
25
26libdbusmenu (16.04.1+18.10.20180917-0ubuntu5) focal; urgency=medium
27
28 * No-change rebuild with fixed binutils on arm64.
29
30 -- Matthias Klose <doko@ubuntu.com> Sat, 08 Feb 2020 11:06:21 +0000
31
1libdbusmenu (16.04.1+18.10.20180917-0ubuntu4) focal; urgency=medium32libdbusmenu (16.04.1+18.10.20180917-0ubuntu4) focal; urgency=medium
233
3 * Remove empty documentation indexes, the new gtk-doc doesn't generate34 * Remove empty documentation indexes, the new gtk-doc doesn't generate
435
=== modified file 'debian/control'
--- debian/control 2020-01-13 12:49:08 +0000
+++ debian/control 2022-09-28 22:01:28 +0000
@@ -11,7 +11,7 @@
11 intltool,11 intltool,
12 gnome-common,12 gnome-common,
13 gtk-doc-tools,13 gtk-doc-tools,
14 valgrind [!arm64 !ppc64el],14 valgrind [!arm64 !ppc64el !riscv64],
15 dbus-test-runner,15 dbus-test-runner,
16 xvfb,16 xvfb,
17 libglib2.0-dev (>= 2.35.4),17 libglib2.0-dev (>= 2.35.4),
1818
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am 2019-09-13 16:53:05 +0000
+++ tests/Makefile.am 2022-09-28 22:01:28 +0000
@@ -219,6 +219,7 @@
219 @echo export G_MESSAGES_DEBUG=all >> $@219 @echo export G_MESSAGES_DEBUG=all >> $@
220 @echo $(XVFB_RUN) >> $@220 @echo $(XVFB_RUN) >> $@
221 @echo $(DBUS_RUNNER) --task ./test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter test-json-01.output.json --task ./test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@221 @echo $(DBUS_RUNNER) --task ./test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter test-json-01.output.json --task ./test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@
222 @echo sed -i \"/Using cross-namespace EXTERNAL authentication \(this will deadlock if server is GDBus \< 2.73.3\)/d\" test-json-01.output.json >> $@
222 @echo diff $(srcdir)/test-json-01.json test-json-01.output.json \> /dev/null >> $@223 @echo diff $(srcdir)/test-json-01.json test-json-01.output.json \> /dev/null >> $@
223 @chmod +x $@224 @chmod +x $@
224225

Subscribers

People subscribed via source and target branches