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

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 :
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
1=== modified file 'debian/changelog'
2--- debian/changelog 2020-01-13 12:53:02 +0000
3+++ debian/changelog 2022-09-28 22:01:28 +0000
4@@ -1,3 +1,34 @@
5+libdbusmenu (16.04.1+18.10.20180917-0ubuntu9) UNRELEASED; urgency=medium
6+
7+ * Prevent test-json from failing because of "Using cross-namespace
8+ EXTERNAL authentication" warning (LP: #1991138).
9+
10+ -- Nathan Pratta Teodosio <nathan.teodosio@canonical.com> Wed, 28 Sep 2022 13:44:33 -0300
11+
12+libdbusmenu (16.04.1+18.10.20180917-0ubuntu8) jammy; urgency=high
13+
14+ * No change rebuild for ppc64el baseline bump.
15+
16+ -- Julian Andres Klode <juliank@ubuntu.com> Thu, 24 Mar 2022 13:10:53 +0100
17+
18+libdbusmenu (16.04.1+18.10.20180917-0ubuntu7) impish; urgency=medium
19+
20+ * No-change rebuild to build packages with zstd compression.
21+
22+ -- Matthias Klose <doko@ubuntu.com> Thu, 07 Oct 2021 12:14:52 +0200
23+
24+libdbusmenu (16.04.1+18.10.20180917-0ubuntu6) focal; urgency=medium
25+
26+ * Disable valgrind on riscv64. It's not there yet.
27+
28+ -- William Grant <wgrant@ubuntu.com> Mon, 06 Apr 2020 15:54:52 +1000
29+
30+libdbusmenu (16.04.1+18.10.20180917-0ubuntu5) focal; urgency=medium
31+
32+ * No-change rebuild with fixed binutils on arm64.
33+
34+ -- Matthias Klose <doko@ubuntu.com> Sat, 08 Feb 2020 11:06:21 +0000
35+
36 libdbusmenu (16.04.1+18.10.20180917-0ubuntu4) focal; urgency=medium
37
38 * Remove empty documentation indexes, the new gtk-doc doesn't generate
39
40=== modified file 'debian/control'
41--- debian/control 2020-01-13 12:49:08 +0000
42+++ debian/control 2022-09-28 22:01:28 +0000
43@@ -11,7 +11,7 @@
44 intltool,
45 gnome-common,
46 gtk-doc-tools,
47- valgrind [!arm64 !ppc64el],
48+ valgrind [!arm64 !ppc64el !riscv64],
49 dbus-test-runner,
50 xvfb,
51 libglib2.0-dev (>= 2.35.4),
52
53=== modified file 'tests/Makefile.am'
54--- tests/Makefile.am 2019-09-13 16:53:05 +0000
55+++ tests/Makefile.am 2022-09-28 22:01:28 +0000
56@@ -219,6 +219,7 @@
57 @echo export G_MESSAGES_DEBUG=all >> $@
58 @echo $(XVFB_RUN) >> $@
59 @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 >> $@
60+ @echo sed -i \"/Using cross-namespace EXTERNAL authentication \(this will deadlock if server is GDBus \< 2.73.3\)/d\" test-json-01.output.json >> $@
61 @echo diff $(srcdir)/test-json-01.json test-json-01.output.json \> /dev/null >> $@
62 @chmod +x $@
63

Subscribers

People subscribed via source and target branches