From 24c6a1293c2333ea523740bba8cc02a6d941bfad Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Thu, 29 Mar 2012 16:35:34 -0400
Subject: releasing version 0.5.96-0ubuntu1

---
 debian/changelog | 12 +++++++++---
 debian/control   |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 68279f0..45bb33f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,18 @@
-libdbusmenu (0.5.96-0ubuntu1~ppa1) precise; urgency=low
+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
-- 
cgit v1.2.3


From d3fb9ada324ede93d8dc789a621380c1c7828d21 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 2 Apr 2012 09:25:13 -0500
Subject: Turns out we don't need the valgrind libs to use those macros, the
 pkgconfig file is over zealous.  Thanks go to sewardj!

---
 configure.ac      | 4 ++--
 tests/Makefile.am | 1 +
 2 files changed, 3 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/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 = \
-- 
cgit v1.2.3