Merge source into branch 2.0_beta.

diff --git a/debian/changelog b/debian/changelog
index 06cc1b1..32f06d9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,73 +1,21 @@
 sf-plugin-light-emul (0.2.3) unstable; urgency=low
-  
+
   * modified for support updated libslp-sensor
+  * Git: slp/pkgs/e/emulator-plugin-light
+  * Tag: sf-plugin-light-emul_0.2.3
 
- -- Sungmin Ha <sungmin82.ha@samsung.com>  Thu, 5 Apr 2012 15:06:52 +0900
+ -- Jihye kim <jihye1128.kim@samsung.com> Fri, 6 Apr 2012 20:00:00 +0900
 
 sf-plugin-light-emul (0.2.2) unstable; urgency=low
 
-    * modified for build only i386
+  * Update changelog version.
+  * Git: slp/pkgs/e/emulator-plugin-light
+  * Tag: sf-plugin-light-emul_0.2.2
 
- -- Sungmin Ha <sungmin82.ha@samsung.com>  Sat, 18 Feb 2012 13:06:52 +0900
+ -- Kitae kim <kt920.kim@samsung.com> Thu, 27 Mar 2012 20:00:00 +0900
 
 sf-plugin-light-emul (0.2.1) unstable; urgency=low
 
- -- Sungmin Ha <sungmin82.ha@samsung.com> Fri, 10 Feb 2012 14:00:00 +0900
-
-sf-plugin-light-sim (0.1.2-2) unstable; urgency=low
-
-  * some prevent-checking-bug fix (CID 14032 , 14031)
-  * Git:165.213.180.234:/git/slp/pkgs/sf-plugin-light-sim
-  * Tag:sf-plugin-light-sim_0.1.2-2
-
- -- Yong-sul Oh <yongsul96.oh@samsung.com>  Wed, 15 Sep 2010 18:35:26 +0900
-
-sf-plugin-light-sim (0.1.2-1) unstable; urgency=low
-
-  * change get_struct_value() & get_property()
-  * Git:165.213.180.234:/git/slp2.0/slp2.0-pkgs/sf-plugin-light-sim-0
-  * Tag:sf-plugin-light-sim_0.1.2-1
-
- -- Yong-sul Oh <yongsul96.oh@samsung.com>  Tue, 15 Jun 2010 09:58:48 +0900
-
-sf-plugin-light-sim (0.1.1-1) unstable; urgency=low
-
-  * change for new libslp-sensor APIs
-  * Git:165.213.180.234:/git/slp2.0/slp2.0-pkgs/sf-plugin-light-sim-0
-  * Tag:sf-plugin-light-sim_0.1.1-1
-
- -- Yong-sul Oh <yongsul96.oh@samsung.com>  Mon, 31 May 2010 01:17:56 +0900
-
-sf-plugin-light-sim (0.0.4-2) unstable; urgency=low
-
-  * DAC rule changed 
-  * Git:165.213.180.234:/git/slp2.0/slp2.0-pkgs/sf-plugin-light-sim-0
-  * Tag:sf-plugin-light-sim_0.0.4-2
-
- -- Yong-sul Oh <yongsul96.oh@samsung.com>  Mon, 10 May 2010 21:01:46 +0900
-
-sf-plugin-light-sim (0.0.4-1) unstable; urgency=low
-
-  * add {pkg_name}.postinst.in for permission control & add free() codes when it's class constructor returned with error
-  * Git:165.213.180.234:/git/slp2.0/slp2.0-pkgs/sf-plugin-light-sim-0
-  * Tag:sf-plugin-light-sim_0.0.4-1
-
- -- Yong-sul Oh <yongsul96.oh@samsung.com>  Tue, 20 Apr 2010 13:10:18 +0900
-
-sf-plugin-light-sim (0.0.3-1) unstable; urgency=low
-
-  * add real-device checking routine ( return NULL when a real-device does not exist )
-
- -- Yong-sul Oh <yongsul96.oh@samsung.com>  Thu, 01 Apr 2010 10:34:58 +0900
-
-sf-plugin-light-sim (0.0.2-1) unstable; urgency=low
-
-  * double-execute updating bug-fix & toolchain upgrade
-
- -- Yong-sul Oh <yongsul96.oh@samsung.com>  Fri, 19 Mar 2010 14:29:05 +0900
-
-sf-plugin-light-sim (0.0.1-1) unstable; urgency=low
-
   * Initial Release.
 
- -- Yong-sul Oh <yongsul96.oh@samsung.com>  Thu, 18 Feb 2010 12:31:00 +0900
+ -- Sungmin Ha <sungmin82.ha@samsung.com> Thu, 15 Mar 2012 17:00:00 +0900

diff --git a/debian/control b/debian/control
index 5453aef..76b3a7c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: sf-plugin-light-emul
 Section: misc
 Priority: extra
-Maintainer: Sungmin ha <sungmin82.ha@samsung.com>
+Maintainer:Sungmin ha <sungmin82.ha@samsung.com>,Jihye Kim <jihye1128.kim@samsung.com>,Yeongkyoon Lee <yeongkyoon.lee@samsung.com>
 Build-Depends: libsf-common-dev
 Standards-Version: 0.2.3