Merge branch 'master' into tizen_2.0

Change-Id: I21916f27e35107fba750034fbd6745e9880d4a44

diff --git a/AUTHORS b/AUTHORS
new file mode 100755 (executable)
index 0000000..196e85e
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1 @@
+seungtaek chung <seungtaek.chung at samsung dot com>

diff --git a/LICENSE b/LICENSE.Flora
similarity index 100%
rename from LICENSE
rename to LICENSE.Flora

diff --git a/NOTICE b/NOTICE
new file mode 100755 (executable)
index 0000000..5fa11d2
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,3 @@
+Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
+Except as noted, this software is licensed under Flora License, Version 1.
+Please, see the LICENSE file for Flora License terms and conditions.

diff --git a/packaging/org.tizen.lockscreen.spec b/packaging/org.tizen.lockscreen.spec
index 3e0f039..25d7f47 100755 (executable)
--- a/packaging/org.tizen.lockscreen.spec
+++ b/packaging/org.tizen.lockscreen.spec
@@ -35,7 +35,7 @@ make %{?jobs:-j%jobs}
 %make_install
 mkdir -p %{buildroot}/usr/apps/org.tizen.lockscreen/data
 mkdir -p %{buildroot}/usr/share/license
-install -m 0755 LICENSE %{buildroot}/usr/share/license/org.tizen.lockscreen
+install -m 0755 LICENSE.Flora %{buildroot}/usr/share/license/org.tizen.lockscreen
 
 %post
 /sbin/ldconfig