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

[Nathan Teodosio]

[Nathan Teodosio (nteodosio)]

Fixes failing test[1].

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

[Dmitry Shachnev (mitya57)]

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]

497. By Nathan Teodosio on 2022-09-28

Incorporate changelog from previous releases.

498. By Nathan Teodosio on 2022-09-28

Prevent test-json from failing because of warning.

[Nathan Teodosio (nteodosio)]

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

This one was tested with dpkg-buildpackage -b.

=== 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 @@
+libdbusmenu (16.04.1+18.10.20180917-0ubuntu9) UNRELEASED; urgency=medium
+
+  * Prevent test-json from failing because of "Using cross-namespace
+    EXTERNAL authentication" warning (LP: #1991138).
+
+ -- Nathan Pratta Teodosio <[e-mail]>  Wed, 28 Sep 2022 13:44:33 -0300
+
+libdbusmenu (16.04.1+18.10.20180917-0ubuntu8) jammy; urgency=high
+
+  * No change rebuild for ppc64el baseline bump.
+
+ -- Julian Andres Klode <[e-mail]>  Thu, 24 Mar 2022 13:10:53 +0100
+
+libdbusmenu (16.04.1+18.10.20180917-0ubuntu7) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <[e-mail]>  Thu, 07 Oct 2021 12:14:52 +0200
+
+libdbusmenu (16.04.1+18.10.20180917-0ubuntu6) focal; urgency=medium
+
+  * Disable valgrind on riscv64. It's not there yet.
+
+ -- William Grant <[e-mail]>  Mon, 06 Apr 2020 15:54:52 +1000
+
+libdbusmenu (16.04.1+18.10.20180917-0ubuntu5) focal; urgency=medium
+
+  * No-change rebuild with fixed binutils on arm64.
+
+ -- Matthias Klose <[e-mail]>  Sat, 08 Feb 2020 11:06:21 +0000
+
 libdbusmenu (16.04.1+18.10.20180917-0ubuntu4) focal; urgency=medium
 
   * Remove empty documentation indexes, the new gtk-doc doesn't generate

=== 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 @@
                intltool,
                gnome-common,
                gtk-doc-tools,
-               valgrind [!arm64 !ppc64el],
+               valgrind [!arm64 !ppc64el !riscv64],
                dbus-test-runner,
                xvfb,
                libglib2.0-dev (>= 2.35.4),

=== 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 @@
 	@echo export G_MESSAGES_DEBUG=all >> $@
 	@echo $(XVFB_RUN) >> $@
 	@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 >> $@
+	@echo sed -i \"/Using cross-namespace EXTERNAL authentication \(this will deadlock if server is GDBus \< 2.73.3\)/d\" test-json-01.output.json >> $@
 	@echo diff $(srcdir)/test-json-01.json test-json-01.output.json \> /dev/null >> $@
 	@chmod +x $@