diff options
| author | Evgeni Golov <evgeni@debian.org> | 2010-07-14 10:19:53 +0200 |
|---|---|---|
| committer | Evgeni Golov <evgeni@debian.org> | 2010-07-14 10:19:53 +0200 |
| commit | 44e511fb4f72420180baf757179efe3d483a91ca (patch) | |
| tree | 32ebdba980ad21a3227526365e8ae61b64b5daaa /configure.ac | |
| parent | 2404f2f70b5c1a110383b15694e5784cd2d6013c (diff) | |
| parent | 674342c670052bcfcc92b7638de9af482ae2a856 (diff) | |
| download | libdbusmenu-44e511fb4f72420180baf757179efe3d483a91ca.tar.gz libdbusmenu-44e511fb4f72420180baf757179efe3d483a91ca.tar.bz2 libdbusmenu-44e511fb4f72420180baf757179efe3d483a91ca.zip | |
Merge new upstreams and changes from Ubuntu.
* New upstream release.
∘ Protect against NULL nodes (LP: #602444)
∘ Remove extra warnings and messages
∘ Handle not having a session bus better (LP: #598715)
* New upstream release.
* Block building submenus on separators (LP: #598620)
* Adding more through JSON support for testing
* Fixing up value handling in dbusmenu-dumper
* debian/control, debian/libdbusmenu-jsonloader*install: Adding
two binary packages for the jsonloader test library.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 80c4b8b..7ec994b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libdbusmenu, 0.3.3, ted@canonical.com) +AC_INIT(libdbusmenu, 0.3.5, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) AC_PREREQ(2.62) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libdbusmenu, 0.3.3, [-Wno-portability]) +AM_INIT_AUTOMAKE(libdbusmenu, 0.3.5, [-Wno-portability]) AM_MAINTAINER_MODE @@ -62,8 +62,10 @@ AC_SUBST(DBUSMENUGTK_LIBS) ########################### JSON_GLIB_REQUIRED_VERSION=0.6.0 +GIO_UNIX_REQUIRED_VERSION=2.24 -PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION) +PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) AC_SUBST(DBUSMENUTESTS_CFLAGS) AC_SUBST(DBUSMENUTESTS_LIBS) @@ -85,7 +87,7 @@ AC_PATH_PROG([VALA_API_GEN], [vapigen]) ########################### LIBDBUSMENU_CURRENT=1 -LIBDBUSMENU_REVISION=8 +LIBDBUSMENU_REVISION=10 LIBDBUSMENU_AGE=0 AC_SUBST(LIBDBUSMENU_CURRENT) @@ -126,6 +128,7 @@ libdbusmenu-gtk/dbusmenu-gtk.pc tools/Makefile tools/testapp/Makefile tests/Makefile +tests/dbusmenu-jsonloader.pc docs/Makefile docs/libdbusmenu-glib/Makefile docs/libdbusmenu-glib/reference/Makefile |