From fff3c6bf726a35980668c10c77c404746f0f77c0 Mon Sep 17 00:00:00 2001
From: Jinkun Jang <jinkun.jang@samsung.com>
Date: Sat, 16 Mar 2013 01:13:06 +0900
Subject: [PATCH] merge with master

---
 LICENSE.APLv2 => LICENSE              | 0
 NOTICE => NOTICE.APLv2.0              | 2 +-
 hfp-agent/org.bluez.hfp_agent.service | 1 +
 map-agent/org.bluez.map_agent.service | 1 +
 packaging/bluetooth-agent.spec        | 2 +-
 pb-agent/org.bluez.pb_agent.service   | 1 +
 6 files changed, 5 insertions(+), 2 deletions(-)
 rename LICENSE.APLv2 => LICENSE (100%)
 rename NOTICE => NOTICE.APLv2.0 (64%)

diff --git a/LICENSE.APLv2 b/LICENSE
similarity index 100%
rename from LICENSE.APLv2
rename to LICENSE
diff --git a/NOTICE b/NOTICE.APLv2.0
similarity index 64%
rename from NOTICE
rename to NOTICE.APLv2.0
index 0e0f016..ccdad52 100644
--- a/NOTICE
+++ b/NOTICE.APLv2.0
@@ -1,3 +1,3 @@
 Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
 Except as noted, this software is licensed under Apache License, Version 2.
-Please, see the LICENSE.APLv2 file for Apache License terms and conditions.
+Please, see the LICENSE file for Apache License terms and conditions.
diff --git a/hfp-agent/org.bluez.hfp_agent.service b/hfp-agent/org.bluez.hfp_agent.service
index ec36aa3..28e2aa2 100644
--- a/hfp-agent/org.bluez.hfp_agent.service
+++ b/hfp-agent/org.bluez.hfp_agent.service
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=org.bluez.hfp_agent
 Exec=/usr/bin/bluetooth-hfp-agent
+User=root
diff --git a/map-agent/org.bluez.map_agent.service b/map-agent/org.bluez.map_agent.service
index 3a5a867..b299104 100644
--- a/map-agent/org.bluez.map_agent.service
+++ b/map-agent/org.bluez.map_agent.service
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=org.bluez.map_agent
 Exec=/usr/bin/bluetooth-map-agent
+User=root
diff --git a/packaging/bluetooth-agent.spec b/packaging/bluetooth-agent.spec
index 8cc6ce8..be47e72 100644
--- a/packaging/bluetooth-agent.spec
+++ b/packaging/bluetooth-agent.spec
@@ -1,6 +1,6 @@
 Name:       bluetooth-agent
 Summary:    Bluetooth agent packages that support various external profiles
-Version:    0.0.7
+Version:    0.0.8
 Release:    2
 Group:      TO_BE/FILLED_IN
 License:    TO BE FILLED IN
diff --git a/pb-agent/org.bluez.pb_agent.service b/pb-agent/org.bluez.pb_agent.service
index e890341..c4426a3 100644
--- a/pb-agent/org.bluez.pb_agent.service
+++ b/pb-agent/org.bluez.pb_agent.service
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=org.bluez.pb_agent
 Exec=/usr/bin/bluetooth-pb-agent
+User=root
-- 
2.7.4