From: Jinkun Jang Date: Fri, 15 Mar 2013 16:25:18 +0000 (+0900) Subject: merge with master X-Git-Tag: 2.1b_release~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f8d12b8403d455030bdf8a9c89e26c931b3d85b1;p=sdk%2Femulator-plugin-gyro-pkgs.git merge with master --- 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..bb1cb4b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1 +1,21 @@ +This is $PACKAGE_NAME, written and maintained by Yongsul Oh +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/packaging/sf-plugin-gyro-emul-pkgs.spec b/packaging/sf-plugin-gyro-emul-pkgs.spec index 18d91a4..4d96298 100644 --- a/packaging/sf-plugin-gyro-emul-pkgs.spec +++ b/packaging/sf-plugin-gyro-emul-pkgs.spec @@ -1,6 +1,6 @@ #git:/slp/pkgs/e/emulator-plugin-gyro-pkgs Name: sf-plugin-gyro-emul-pkgs -Version: 0.2.9 +Version: 0.2.7 Release: 1 Summary: gyro-sim plugins for sensor framework (using setting) Group: System Environment/Libraries diff --git a/processor/include/gyro_sim_processor.h b/processor/include/gyro_sim_processor.h index 75124fb..0ff642d 100644 --- a/processor/include/gyro_sim_processor.h +++ b/processor/include/gyro_sim_processor.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/processor/src/gyro_sim_processor.cpp b/processor/src/gyro_sim_processor.cpp index 3e9483c..15c75cb 100644 --- a/processor/src/gyro_sim_processor.cpp +++ b/processor/src/gyro_sim_processor.cpp @@ -4,7 +4,6 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * SooYoung Ha * Sungmin Ha * DongKyun Yun * diff --git a/sensor/include/cgyro_sim.h b/sensor/include/cgyro_sim.h index a3af789..1cc1c81 100644 --- a/sensor/include/cgyro_sim.h +++ b/sensor/include/cgyro_sim.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/sensor/include/l3g4200d.h b/sensor/include/l3g4200d.h index daec0fc..4083849 100644 --- a/sensor/include/l3g4200d.h +++ b/sensor/include/l3g4200d.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/sensor/src/cgyro_sim.cpp b/sensor/src/cgyro_sim.cpp index 122e2a1..1c57c15 100644 --- a/sensor/src/cgyro_sim.cpp +++ b/sensor/src/cgyro_sim.cpp @@ -4,7 +4,6 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * SooYoung Ha * Sungmin Ha * DongKyun Yun * @@ -102,7 +101,6 @@ cgyro_sim::cgyro_sim() cgyro_sim::~cgyro_sim() { free(m_name); - free(m_resource); if ( m_ioctl_fd != -1 ) { close(m_ioctl_fd); }