diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-04-04 15:01:33 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-04-04 15:01:33 -0500 |
| commit | fe87fe143ac15a15fbe5e035de48fd5d44801878 (patch) | |
| tree | 0924c74b5c9cf87b8e3a79ba2a4338c84e5654b6 | |
| parent | 86a192f69a22c48c5aa3965310be3b04f1f3e379 (diff) | |
| parent | 3e7b2a057b93b8885047f79b15957b4e6207cf71 (diff) | |
| download | libdbusmenu-fe87fe143ac15a15fbe5e035de48fd5d44801878.tar.gz libdbusmenu-fe87fe143ac15a15fbe5e035de48fd5d44801878.tar.bz2 libdbusmenu-fe87fe143ac15a15fbe5e035de48fd5d44801878.zip | |
Sync from Ubuntu Desktop
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | debian/changelog | 18 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | tests/Makefile.am | 1 |
4 files changed, 19 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index e397cb5..a46901f 100644 --- a/configure.ac +++ b/configure.ac @@ -118,10 +118,10 @@ AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"]) AS_IF([test "x$enable_tests" != "xno"],[ PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - valgrind, + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION, [have_tests=yes] ) +PKG_CHECK_MODULES(DBUSMENUTESTSVALGRIND, valgrind) ]) AC_SUBST(DBUSMENUTESTS_CFLAGS) diff --git a/debian/changelog b/debian/changelog index 68279f0..533aeed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,24 @@ -libdbusmenu (0.5.96-0ubuntu1~ppa1) precise; urgency=low +libdbusmenu (0.5.96-0ubuntu2) precise; urgency=low + * Cherry pick fix for FTBFS on arm + + -- Ken VanDine <ken.vandine@canonical.com> Tue, 03 Apr 2012 16:43:10 -0400 + +libdbusmenu (0.5.96-0ubuntu1) precise; urgency=low + + [ Charles Kerr ] * New upstream release. * Faster menuitem lookups (LP: #801699) - * To reduce dbus traffic, only send event replies when the caller requests them + * To reduce dbus traffic, only send event replies when the caller + requests them * Added support for callgrind-based benchmarks * Minor code cleanup - -- Charles Kerr <charles.kerr@canonical.com> Thu, 29 Mar 2012 11:38:40 -0700 + [ Ken VanDine ] + * debian/control + - added build depends on valgrind + + -- Ken VanDine <ken.vandine@canonical.com> Thu, 29 Mar 2012 16:35:00 -0400 libdbusmenu (0.5.95-0ubuntu1) precise; urgency=low diff --git a/debian/control b/debian/control index a14bc40..49438f9 100644 --- a/debian/control +++ b/debian/control @@ -22,6 +22,7 @@ Build-Depends: debhelper (>= 8.1.3), libgirepository1.0-dev (>= 0.9.3), libx11-dev (>= 1.3), dh-autoreconf, + valgrind, valac-0.16 Standards-Version: 3.9.2 Homepage: https://launchpad.net/dbusmenu diff --git a/tests/Makefile.am b/tests/Makefile.am index 82f6a9d..805adb9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -223,6 +223,7 @@ test_json_server_CFLAGS = \ -I $(srcdir) \ $(DBUSMENUGLIB_CFLAGS) \ $(DBUSMENUTESTS_CFLAGS) \ + $(DBUSMENUTESTSVALGRIND_CFLAGS) \ -Wall -Werror test_json_server_LDADD = \ |