From 6de882725e55bbda37113773918478349a7c45b9 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 19 Sep 2012 12:10:01 -0500 Subject: 12.10.0 --- NEWS | 8 ++++++++ configure.ac | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index e69de29..95fef36 100644 --- a/NEWS +++ b/NEWS @@ -0,0 +1,8 @@ +12.10.0 + - Honor changes to GtkSettings' gtk-menu-images value (lp: #927236) + - don't display an underscore on menuitimes containing a '&' (lp: #994564) + - set the widget for the accelerator even if there isn't a mnemonic (lp: #982656) + - make the vala bindings use pkg-config names, rather than gir ones + - Some platforms don't have valgrind, so treat those unit tests separately + - make headers match independent of the build directory + - constify some public API calls diff --git a/configure.ac b/configure.ac index 608e80d..e0c61bd 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libdbusmenu, 0.6.1, ted@canonical.com) +AC_INIT(libdbusmenu, 12.10.0, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) AC_PREREQ(2.62) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libdbusmenu, 0.6.1, [-Wno-portability]) +AM_INIT_AUTOMAKE(libdbusmenu, 12.10.0, [-Wno-portability]) AM_MAINTAINER_MODE -- cgit v1.2.3 From 8f64d9a61a64ed3b0ff7b1248a2d8f92524907e2 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 19 Sep 2012 18:55:27 -0500 Subject: in the test-json and test-json-instruction unit tests, don't tell dbus-test-runner to ignore the server & clients' return values --- tests/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index c375562..0cd68d0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -237,7 +237,7 @@ test-json: test-json-client test-json-server Makefile.am @echo export UBUNTU_MENUPROXY="" >> $@ @echo export G_DEBUG=fatal_criticals >> $@ @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 --ignore-return --task ./test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json --ignore-return >> $@ + @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 diff $(srcdir)/test-json-01.json test-json-01.output.json \> /dev/null >> $@ @chmod +x $@ @@ -281,7 +281,7 @@ test-json-instruction: test-json-client test-json-server test-json-instruction-c @echo export UBUNTU_MENUPROXY="" >> $@ @echo export G_DEBUG=fatal_criticals >> $@ @echo $(XVFB_RUN) >> $@ - @echo $(DBUS_RUNNER) --task $(builddir)/test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter /dev/null --ignore-return --task libtool --parameter --mode=execute --parameter $(srcdir)/test-json-instruction-count --parameter $(builddir)/test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json --ignore-return >> $@ + @echo $(DBUS_RUNNER) --task $(builddir)/test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter /dev/null --task libtool --parameter --mode=execute --parameter $(srcdir)/test-json-instruction-count --parameter $(builddir)/test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@ @chmod +x $@ EXTRA_DIST += \ -- cgit v1.2.3 From 61ea13c1c60838570de64b026172dcf13d56ccb0 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 19 Sep 2012 19:06:22 -0500 Subject: Undo r423, I found this bug while preparing the dbusmenu release but forgot to revert the version before pushing this branch. --- NEWS | 8 -------- configure.ac | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/NEWS b/NEWS index 95fef36..e69de29 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +0,0 @@ -12.10.0 - - Honor changes to GtkSettings' gtk-menu-images value (lp: #927236) - - don't display an underscore on menuitimes containing a '&' (lp: #994564) - - set the widget for the accelerator even if there isn't a mnemonic (lp: #982656) - - make the vala bindings use pkg-config names, rather than gir ones - - Some platforms don't have valgrind, so treat those unit tests separately - - make headers match independent of the build directory - - constify some public API calls diff --git a/configure.ac b/configure.ac index e0c61bd..608e80d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libdbusmenu, 12.10.0, ted@canonical.com) +AC_INIT(libdbusmenu, 0.6.1, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) AC_PREREQ(2.62) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libdbusmenu, 12.10.0, [-Wno-portability]) +AM_INIT_AUTOMAKE(libdbusmenu, 0.6.1, [-Wno-portability]) AM_MAINTAINER_MODE -- cgit v1.2.3