diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2012-04-03 16:43:59 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2012-04-03 16:43:59 -0400 |
| commit | 3e7b2a057b93b8885047f79b15957b4e6207cf71 (patch) | |
| tree | 0924c74b5c9cf87b8e3a79ba2a4338c84e5654b6 | |
| parent | 24c6a1293c2333ea523740bba8cc02a6d941bfad (diff) | |
| parent | 5c3834907b18b2c9230d39767ab9092e80c5c849 (diff) | |
| download | libdbusmenu-3e7b2a057b93b8885047f79b15957b4e6207cf71.tar.gz libdbusmenu-3e7b2a057b93b8885047f79b15957b4e6207cf71.tar.bz2 libdbusmenu-3e7b2a057b93b8885047f79b15957b4e6207cf71.zip | |
releasing version 0.5.96-0ubuntu2
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | tests/Makefile.am | 1 |
3 files changed, 9 insertions, 2 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 45bb33f..533aeed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +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 ] 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 = \ |