  - Reinstate D-Bus service file org.chromium.Chaps.service
  - DBus::Connection::acquire_name does not exist in the upstream version
    of libdbus-c++, so stick to the original request_name use on Linux
-
+ - Disable :memory: tests if libmemenv not present.
 ---
+ chaps/Makefile                   | 6 +++++-
+ chaps/chaps.cc                   | 1 +
+ chaps/chaps_adaptor.cc           | 4 ++++
+ chaps/chaps_proxy.cc             | 2 +-
+ chaps/isolate_linux.cc           | 2 +-
+ chaps/object_store_test.cc       | 2 ++
+ chaps/org.chromium.Chaps.service | 4 ++++
+ 7 files changed, 18 insertions(+), 3 deletions(-)
+ create mode 100644 chaps/org.chromium.Chaps.service
 
 diff --git a/chaps/Makefile b/chaps/Makefile
 index ad55a0622ae9..f4aaf1ac18f6 100644

+Name=org.chromium.Chaps
+Exec=/usr/sbin/chapsd
+User=root

From e2552a6c18b309124481d9b72a02f2cae1cf98a1 Mon Sep 17 00:00:00 2001
From: David Drysdale <drysdale@google.com>
Date: Fri, 12 Sep 2014 10:32:19 +0100
Subject: [PATCH] Updates for standalone Linux Chaps build
