From 1f8386f2555d8ed54c119285307b1d8af5699892 Mon Sep 17 00:00:00 2001
From: Jinkun Jang <jinkun.jang@samsung.com>
Date: Sat, 16 Mar 2013 01:18:15 +0900
Subject: merge with master

---
 packaging/power-manager.manifest | 2 ++
 packaging/power-manager.spec     | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'packaging')

diff --git a/packaging/power-manager.manifest b/packaging/power-manager.manifest
index e4d4971..54e7bce 100644
--- a/packaging/power-manager.manifest
+++ b/packaging/power-manager.manifest
@@ -8,6 +8,8 @@
     <assign>
         <filesystem path="/etc/rc.d/init.d/pmctrl" label="_" exec_label="none" />
         <filesystem path="/etc/rc.d/rc3.d/S35power-manager" label="_" exec_label="none" />
+	<filesystem path="/usr/lib/systemd/system/power-manager.service" label="_" exec_label="none" />
+	<filesystem path="/usr/lib/systemd/system/multi-user.target.wants/power-manager.service" label="_" exec_label="none" />
     </assign>
 </manifest>
 
diff --git a/packaging/power-manager.spec b/packaging/power-manager.spec
index 0004a9c..a392536 100644
--- a/packaging/power-manager.spec
+++ b/packaging/power-manager.spec
@@ -1,7 +1,7 @@
 Name:       power-manager
 Summary:    Power manager
 Version:    1.3.23
-Release:    8
+Release:    9
 Group:      framework/system
 License:    APLv2
 Source0:    %{name}-%{version}.tar.gz
@@ -16,7 +16,7 @@ BuildRequires:  pkgconfig(aul)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(sensor)
 BuildRequires:  pkgconfig(devman)
-BuildRequires:  pkgconfig(devman_plugin)
+BuildRequires:  pkgconfig(device-node)
 BuildRequires:  pkgconfig(heynoti)
 
 %description
@@ -61,6 +61,8 @@ vconftool set -t int memory/pm/battery_timetofull -1 -i
 vconftool set -t int memory/pm/battery_timetoempty -1 -i
 vconftool set -t int memory/pm/custom_brightness_status 0 -i -g 5000
 vconftool set -t bool memory/pm/brt_changed_lpm 0 -i
+vconftool set -t int memory/pm/current_brt 60 -i -g 5000
+
 
 heynotitool set system_wakeup
 heynotitool set pm_event
-- 
cgit v1.2.3