merge with master

diff --git a/AUTHORS b/AUTHORS
index 1722483..8acdf13 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,12 +1,3 @@
-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>
+DongKyun Yun <dk77.yun@samsung.com>
+Sungmin Ha <sungmin82.ha@samsung.com>
 HyunGoo Kang <hyungoo1.kang@samsung.com>

diff --git a/LICENSE.LGPLv2.1 b/COPYING
similarity index 99%
rename from LICENSE.LGPLv2.1
rename to COPYING
index 9c92a19..fabb204 100644 (file)
--- a/LICENSE.LGPLv2.1
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved.
+Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
 
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999

diff --git a/NOTICE b/NOTICE
index 18b91b4..f085dc6 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -1,3 +1 @@
-Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under GNU LESSER GENERAL PUBLIC LICENSE Version 2.1.
-Please, see the LICENSE.LGPLv2.1 file for GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, terms and conditions.
+Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.\r

diff --git a/debian/copyright b/debian/copyright
index 8b13789..ce0fd88 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1 +1,21 @@
+This is $PACKAGE_NAME, written and maintained by $NAME <$EMAIL>
+on Fri, 13 Nov 2009 14:08:22 +0900.
 
+The original source can always be found at:
+       ftp://slp.samsung.net/dists/unstable/main/source/
+
+Copyright Holder: $NAME
+
+License:
+       samsung
+
+/*
+ * Copyright (c) 2008 Samsung Electronics, Inc.
+ * All rights reserved.
+ *
+ * This software is a confidential and proprietary information
+ * of Samsung Electronics, Inc. ("Confidential Information").  You
+ * shall not disclose such Confidential Information and shall use
+ * it only in accordance with the terms of the license agreement
+ * you entered into with Samsung Electronics. 
+ */

diff --git a/include/accel_sim_filter.h b/include/accel_sim_filter.h
index ac54798..a08056e 100644 (file)
--- a/include/accel_sim_filter.h
+++ b/include/accel_sim_filter.h
@@ -3,9 +3,7 @@
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact:
- * SooYoung Ha <yoosah.ha@samsnung.com>
- * Sungmin Ha <sungmin82.ha@samsung.com>
+ * Contact: Sungmin Ha <sungmin82.ha@samsung.com>
  * 
  * This library is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by the

diff --git a/packaging/sf-plugin-filter-accel-emul.spec b/packaging/sf-plugin-filter-accel-emul.spec
index 0bb389e..8c537b4 100644 (file)
--- a/packaging/sf-plugin-filter-accel-emul.spec
+++ b/packaging/sf-plugin-filter-accel-emul.spec
@@ -1,6 +1,6 @@
 #git:/slp/pkgs/e/emulator-plugin-accel-filter
 Name: sf-plugin-filter-accel-emul
-Version: 0.2.11
+Version: 0.2.10
 Release: 1
 Summary: Accel simulator filter plugin for sensor framework
 Group: System Environment/Libraries

diff --git a/src/accel_sim_filter.cpp b/src/accel_sim_filter.cpp
index c61f146..f3162c2 100644 (file)
--- a/src/accel_sim_filter.cpp
+++ b/src/accel_sim_filter.cpp
@@ -3,8 +3,7 @@
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact:
- * SooYoung Ha <yoosah.ha@samsnung.com>
+ * Contact: 
  * Sungmin Ha <sungmin82.ha@samsung.com>
  * DongKyun Yun <dk77.yun@samsung.com>
  *