merge with master

7 files changed, 58 insertions, 74 deletions

diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 978df0f..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1,13 +0,0 @@
-YeongKyoon Lee <yeongkyoon.lee@samsung.com>
-DaiYoung Kim <daiyoung777.kim@samsung.com>
-SeokYeon Hwang <syeon.hwang@samsung.com>
-SangJin Kim <sangjin3.kim@samsung.com>
-KiTae Kim <kt920.kim@samsung.com>
-JinHyung Jo <jinhyung.jo@samsung.com>
-SungMin Ha <sungmin82.ha@samsung.com>
-MunKyu Im <munkyu.im@samsung.com>
-JiHye Kim <jihye1128.kim@samsung.com>
-GiWoong Kim <giwoong.kim@samsung.com>
-SooYoung Ha <yoosah.ha@samsnung.com>
-HyunGoo Kang <hyungoo1.kang@samsung.com>
-
diff --git a/LICENSE.Flora b/LICENSE
index ac633bc..7ccb5b5 100644..100755
--- a/LICENSE.Flora
+++ b/LICENSE
@@ -2,7 +2,7 @@ Flora License
 
 Version 1.0, May, 2012
 
-http://www.floralicense.org/license/
+http://www.tizenopensource.org/license
 
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
diff --git a/NOTICE b/NOTICE
deleted file mode 100644
index 2800840..0000000
--- a/NOTICE
+++ /dev/null
@@ -1,3 +0,0 @@
-Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Flora License, Version 1.
-Please, see the LICENSE.Flora file for Flora License Version 1, terms and conditions.
diff --git a/include/devman_define_node_path.h b/include/devman_define_node_path.h
index 4c35275..4df6558 100644
--- a/include/devman_define_node_path.h
+++ b/include/devman_define_node_path.h
@@ -1,19 +1,3 @@
-/*
-* Copyright 2012  Samsung Electronics Co., Ltd
-*
-* Licensed under the Flora License, Version 1.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*   http://floralicense.org/license/
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
 #ifndef __DEVMAN_DEFINE_NODE_PATH_H
 #define __DEVMAN_DEFINE_NODE_PATH_H
 
diff --git a/include/devman_plugin_intf.h b/include/devman_plugin_intf.h
index 332355e..bc0f03e 100644
--- a/include/devman_plugin_intf.h
+++ b/include/devman_plugin_intf.h
@@ -1,17 +1,22 @@
 /*
-* Copyright 2012  Samsung Electronics Co., Ltd
-*
-* Licensed under the Flora License, Version 1.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*   http://floralicense.org/license/
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
+ *  devman
+ *
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact: DongGi Jang <dg0402.jang@samsung.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
 */
 
 
diff --git a/src/device_manager_io.c b/src/device_manager_io.c
index a9a49dd..8b1d658 100644
--- a/src/device_manager_io.c
+++ b/src/device_manager_io.c
@@ -1,20 +1,24 @@
 /*
-* Copyright 2012  Samsung Electronics Co., Ltd
-*
-* Licensed under the Flora License, Version 1.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*   http://floralicense.org/license/
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
+ *  device-manager-plugin-maru
+ *
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact: DongGi Jang <dg0402.jang@samsung.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
 */
 
-
 /*
  * 2012-03-05 Dohyung Hong <don.hong@samsung.com> Changed package name for the maru board of emulator
  */
diff --git a/src/device_manager_plugin_maru.c b/src/device_manager_plugin_maru.c
index 8d72f0f..9f84998 100644
--- a/src/device_manager_plugin_maru.c
+++ b/src/device_manager_plugin_maru.c
@@ -1,20 +1,27 @@
 /*
-* Copyright 2012  Samsung Electronics Co., Ltd
-*
-* Licensed under the Flora License, Version 1.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*   http://floralicense.org/license/
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
+ *  device-manager-plugin-maru
+ *
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact: Dohyung Hong <don.hong@samsung.com>
+ *
+ * Based on slp/pkgs/d/device-manager-plugin-c210/device_manager_plugin-c210.c
+ * Modified to support the maru board of emulator
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
 */
 
-
 #include <string.h>
 #include <sys/types.h>
 #include <stdio.h>