From bacf8b77300be59b458ce8a068bd6721d3e4393d Mon Sep 17 00:00:00 2001 From: Sooyoung Ha Date: Sat, 13 Apr 2013 20:16:24 +0900 Subject: [PATCH] sync with latest master branch --- AUTHORS | 13 +++++++++++-- COPYING => LICENSE.LGPLv2.1 | 2 +- NOTICE | 4 +++- debian/copyright | 20 -------------------- include/cproxi_sim.h | 4 +++- packaging/sf-plugin-proxi-emul.spec | 2 +- src/cproxi_sim.cpp | 1 + 7 files changed, 20 insertions(+), 26 deletions(-) rename COPYING => LICENSE.LGPLv2.1 (99%) diff --git a/AUTHORS b/AUTHORS index 8acdf13..1722483 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,12 @@ -DongKyun Yun -Sungmin Ha +YeongKyoon Lee +DaiYoung Kim +SeokYeon Hwang +SangJin Kim +KiTae Kim +JinHyung Jo +SungMin Ha +MunKyu Im +JiHye Kim +GiWoong Kim +SooYoung Ha HyunGoo Kang diff --git a/COPYING b/LICENSE.LGPLv2.1 similarity index 99% rename from COPYING rename to LICENSE.LGPLv2.1 index fabb204..9c92a19 100644 --- a/COPYING +++ b/LICENSE.LGPLv2.1 @@ -1,4 +1,4 @@ -Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. +Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 diff --git a/NOTICE b/NOTICE index f085dc6..18b91b4 100644 --- a/NOTICE +++ b/NOTICE @@ -1 +1,3 @@ -Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. +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. diff --git a/debian/copyright b/debian/copyright index b6c081a..8b13789 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,21 +1 @@ -This is sf-plugin-gp2ap002proxi, written and maintained by Yongsul Oh -on Mon, 30 Nov 2009 16:09:50 +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/cproxi_sim.h b/include/cproxi_sim.h index dd9d4ed..f4e0314 100644 --- a/include/cproxi_sim.h +++ b/include/cproxi_sim.h @@ -3,7 +3,9 @@ * * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Sungmin Ha + * Contact: + * SooYoung Ha + * 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-proxi-emul.spec b/packaging/sf-plugin-proxi-emul.spec index e6d3133..9431759 100644 --- a/packaging/sf-plugin-proxi-emul.spec +++ b/packaging/sf-plugin-proxi-emul.spec @@ -1,6 +1,6 @@ #git:/slp/pkgs/e/emulator-plugin-proxi Name: sf-plugin-proxi-emul -Version: 0.2.6 +Version: 0.2.7 Release: 1 Summary: GP2AP002 proximity Plugin for sensor framework Group: System Environment/Libraries diff --git a/src/cproxi_sim.cpp b/src/cproxi_sim.cpp index beeab73..73be293 100644 --- a/src/cproxi_sim.cpp +++ b/src/cproxi_sim.cpp @@ -4,6 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: + * SooYoung Ha * Sungmin Ha * DongKyun Yun * -- 2.7.4