From 12b873bf0834faf19b382a1a80af5b98efc33ea2 Mon Sep 17 00:00:00 2001 From: Sooyoung Ha Date: Sat, 13 Apr 2013 20:16:21 +0900 Subject: [PATCH] sync with latest master branch --- AUTHORS | 13 +++++++++++-- COPYING => LICENSE.LGPLv2.1 | 2 +- NOTICE | 4 +++- debian/copyright | 20 -------------------- packaging/sf-plugin-gyro-emul-pkgs.spec | 2 +- processor/include/gyro_sim_processor.h | 4 +++- processor/src/gyro_sim_processor.cpp | 1 + sensor/include/cgyro_sim.h | 4 +++- sensor/include/l3g4200d.h | 4 +++- sensor/src/cgyro_sim.cpp | 2 ++ 10 files changed, 28 insertions(+), 28 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 bb1cb4b..8b13789 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,21 +1 @@ -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 4d96298..18d91a4 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.7 +Version: 0.2.9 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 0ff642d..75124fb 100644 --- a/processor/include/gyro_sim_processor.h +++ b/processor/include/gyro_sim_processor.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/processor/src/gyro_sim_processor.cpp b/processor/src/gyro_sim_processor.cpp index 15c75cb..3e9483c 100644 --- a/processor/src/gyro_sim_processor.cpp +++ b/processor/src/gyro_sim_processor.cpp @@ -4,6 +4,7 @@ * 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 1cc1c81..a3af789 100644 --- a/sensor/include/cgyro_sim.h +++ b/sensor/include/cgyro_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/sensor/include/l3g4200d.h b/sensor/include/l3g4200d.h index 4083849..daec0fc 100644 --- a/sensor/include/l3g4200d.h +++ b/sensor/include/l3g4200d.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/sensor/src/cgyro_sim.cpp b/sensor/src/cgyro_sim.cpp index 1c57c15..122e2a1 100644 --- a/sensor/src/cgyro_sim.cpp +++ b/sensor/src/cgyro_sim.cpp @@ -4,6 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: + * SooYoung Ha * Sungmin Ha * DongKyun Yun * @@ -101,6 +102,7 @@ cgyro_sim::cgyro_sim() cgyro_sim::~cgyro_sim() { free(m_name); + free(m_resource); if ( m_ioctl_fd != -1 ) { close(m_ioctl_fd); } -- 2.7.4