From 8a44a1c558027d432fa72e4329168e67c162a664 Mon Sep 17 00:00:00 2001 From: Jinkun Jang Date: Sat, 16 Mar 2013 01:25:13 +0900 Subject: [PATCH] merge with master --- AUTHORS | 13 ++----------- LICENSE.LGPLv2.1 => COPYING | 2 +- NOTICE | 4 +--- debian/copyright | 20 ++++++++++++++++++++ include/accel_sim_filter.h | 4 +--- packaging/sf-plugin-filter-accel-emul.spec | 2 +- src/accel_sim_filter.cpp | 3 +-- 7 files changed, 27 insertions(+), 21 deletions(-) rename LICENSE.LGPLv2.1 => COPYING (99%) diff --git a/AUTHORS b/AUTHORS index 1722483..8acdf13 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,12 +1,3 @@ -YeongKyoon Lee -DaiYoung Kim -SeokYeon Hwang -SangJin Kim -KiTae Kim -JinHyung Jo -SungMin Ha -MunKyu Im -JiHye Kim -GiWoong Kim -SooYoung Ha +DongKyun Yun +Sungmin Ha HyunGoo Kang diff --git a/LICENSE.LGPLv2.1 b/COPYING similarity index 99% rename from LICENSE.LGPLv2.1 rename to COPYING index 9c92a19..fabb204 100644 --- 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 --- 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. diff --git a/debian/copyright b/debian/copyright index 8b13789..ce0fd88 100644 --- 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 --- 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 - * Sungmin Ha + * Contact: Sungmin Ha * * 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 --- 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 --- 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 + * Contact: * Sungmin Ha * DongKyun Yun * -- 2.7.4