Merge branch 'sunae_tizen_2.2' into tizen_2.22.2.1_releasetizen_2.2

Change-Id: I3585e38239609b45da2919babffc2fadc80434c4
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>

3 files changed, 18 insertions, 21 deletions

diff --git a/AUTHOR b/AUTHOR
index 978df0f..27057b0 100644
--- a/AUTHOR
+++ b/AUTHOR
@@ -9,5 +9,4 @@ MunKyu Im <munkyu.im@samsung.com>
 JiHye Kim <jihye1128.kim@samsung.com>
 GiWoong Kim <giwoong.kim@samsung.com>
 SooYoung Ha <yoosah.ha@samsnung.com>
-HyunGoo Kang <hyungoo1.kang@samsung.com>
-
+HyunGoo Kang <hyungoo1.kang@samsung.com>
\ No newline at end of file
diff --git a/package/build.ubuntu-32 b/package/build.ubuntu-32
index 1368e4c..5085277 100755
--- a/package/build.ubuntu-32
+++ b/package/build.ubuntu-32
@@ -16,6 +16,7 @@ install()
 {
 	mkdir -p $SRCDIR/package/emulator-tools-common.package.${TARGET_OS}/data
 	mkdir -p $SRCDIR/package/tizen-emulator-tools-x86.package.${TARGET_OS}/data
+#	mkdir -p $SRCDIR/package/tizen-2.1-emulator-image.package.${TARGET_OS}/data
 	mkdir -p $SRCDIR/package/tizen-2.2-emulator-image.package.${TARGET_OS}/data
 }
 
diff --git a/package/changelog b/package/changelog
index 6494995..410a575 100644
--- a/package/changelog
+++ b/package/changelog
@@ -2,35 +2,32 @@
 - update package version (2.1 -> 2.2)
 == Sungmin Ha <sungmin82.ha@samsung.com> 2013-06-12
 * 1.4.9
-- update emulator-image version.
-== Kitae Kim <kt920.kim@samsung.com> 2013-03-14
+- emulator image version up (2.1 -> 2.2)
+== jihye kim <jihye1128.kim@samsung.com> 2013-06-10
 * 1.4.8
-- Added install dependency for version-manager into emulator-qemu-common.
-== Kitae Kim <kt920.kim@samsung.com> 2013-02-25
+- removed an unnecessary field in the build script.
+== Kitae Kim <kt920.kim@samsung.com> 2013-03-18
 * 1.4.7
-- Added meta packages for emulotor-test on Ubuntu-64, Windows and Macos.
-== Kitae Kim <kt920.kim@samsung.com> 2012-12-17
+- update tizen_2.0 to tizen_2.1 on build script
+== Kitae Kim <kt920.kim@samsung.com> 2013-03-15
 * 1.4.6
-- Added install dependency into tizen-emulator-test meta package.
-- emulator-test package was not included in the meta package.
-== Kitae Kim <kt920.kim@samsung.com> 2012-12-06
+- update emulator-image version.
+== Kitae Kim <kt920.kim@samsung.com> 2013-03-14
 * 1.4.5
-- add intelhaxm into install dependency of emulator-tools-common package on Windows and Mac.
-== Kitae Kim <kt920.kim@samsung.com> 2012-11-30
+- Added install dependency for version-manager into emulator-qemu-common.
+== Kitae Kim <kt920.kim@samsung.com> 2013-02-25
 * 1.4.4
-- add new package for emulotor-test.
-== Kitae Kim <kt920.kim@samsung.com> 2012-11-23
+- add new package (eventinjector-cli) on Windows and Mac.
+== Kitae Kim <kt920.kim@samsung.com> 2013-01-08
 * 1.4.3
 - add new package (eventinjector-cli)		
 == jihye kim <jihye1128.kim@samsung.com> 2012-11-20
 * 1.4.2
-- revert the previous commit that is about dependency between tools and image.
-- If platform image depends on tools, sdk installer add a tree under platform image category.
-== Kitae Kim <kt920.kim@samsung.com> 2012-11-06
+- Removed emulator-test from meta packages.
+== Kitae Kim <kt920.kim@samsung.com> 2012-12-07
 * 1.4.1
-- add dependency between emulator tools and images.
-- If users select an emulator image packge on SDK installer, an emulator tool package will be installed.
-== Kitae Kim <kt920.kim@samsung.com> 2012-11-06
+- Added some packages which are emulator-test and intelhaxm into meta packages.
+== Kitae Kim <kt920.kim@samsung.com> 2012-12-06
 * 1.4.0
 - Rename meta packages.
 - Meta packages need to be distinguish by label.