merge for protex2.1b_releasetizen_2.1

Change-Id: I09d91e12800df409dc8504bf216694f09e8a3b76

4 files changed, 79 insertions, 20 deletions

diff --git a/AUTHOR b/AUTHOR
index 27057b0..978df0f 100644
--- a/AUTHOR
+++ b/AUTHOR
@@ -9,4 +9,5 @@ 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>
\ No newline at end of file
+HyunGoo Kang <hyungoo1.kang@samsung.com>
+
diff --git a/package/build.ubuntu-32 b/package/build.ubuntu-32
index 7a5804d..56ce6aa 100755
--- a/package/build.ubuntu-32
+++ b/package/build.ubuntu-32
@@ -16,7 +16,10 @@ 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.0-emulator-image.package.${TARGET_OS}/data
+#	mkdir -p $SRCDIR/package/tizen-emulator-tools-arm.package.${TARGET_OS}/data
+	mkdir -p $SRCDIR/package/tizen-2.1-emulator-image-x86.package.${TARGET_OS}/data
+#	mkdir -p $SRCDIR/package/tizen-2.0-emulator-image-arm.package.${TARGET_OS}/data
+	mkdir -p $SRCDIR/package/tizen-emulator-test.package.${TARGET_OS}/data
 }
 
 [ "$1" = "clean" ] && clean
diff --git a/package/changelog b/package/changelog
index 9f974fb..2b4fe3c 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,42 @@
-* 2.0.0
-- Tizen 2.0 release		
-== Kitae Kim <kt920.kim@samsung.com> 2013-01-11
+* 1.4.9
+- update emulator-image version.
+== Kitae Kim <kt920.kim@samsung.com> 2013-03-14
+* 1.4.8
+- Added install dependency for version-manager into emulator-qemu-common.
+== Kitae Kim <kt920.kim@samsung.com> 2013-02-25
+* 1.4.7
+- Added meta packages for emulotor-test on Ubuntu-64, Windows and Macos.
+== Kitae Kim <kt920.kim@samsung.com> 2012-12-17
+* 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
+* 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
+* 1.4.4
+- add new package for emulotor-test.
+== Kitae Kim <kt920.kim@samsung.com> 2012-11-23
+* 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
+* 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
+* 1.4.0
+- Rename meta packages.
+- Meta packages need to be distinguish by label.
+== Kitae Kim <kt920.kim@samsung.com> 2012-11-01
+* 1.3.17
+- Added meta packages for arm.
+- All of arm packages has been uploaded.
+== Kitae Kim <kt920.kim@samsung.com> 2012-11-01
+* 1.3.16
+- Added changelog file.
+- Install dependency of packages is changed.
+== Kitae Kim <kt920.kim@samsung.com> 2012-10-30
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 1c3d435..3de2cdd 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,22 +1,22 @@
-Version : 2.0.0
+Version : 1.4.9
 Maintainer : Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
 
 Package : emulator-tools-common
 Label : Emulator
 OS : ubuntu-32, ubuntu-64
 Build-host-os : ubuntu-32
-Install-dependency : emulator-qemu-common, emulator-manager, emulator-storages, emulator-lib, sdb, eventinjector-cli
+Install-dependency : emulator-qemu-common, emulator-manager, emulator-storages, emulator-lib, sdb, eventinjector-cli, version-manager
 Description : Tizen Emulator.
 
 Package : emulator-tools-common
 Label : Emulator
 OS : windows-32, windows-64, macos-64
 Build-host-os : ubuntu-32
-Install-dependency : emulator-qemu-common, emulator-manager, emulator-storages, emulator-lib, sdb, eventinjector-cli, intelhaxm
+Install-dependency : emulator-qemu-common, emulator-manager, emulator-storages, emulator-lib, sdb, eventinjector-cli, intelhaxm, version-manager
 Description : Tizen Emulator.
 
 Package : tizen-emulator-tools-x86
-Label : Emulator
+Label : x86 Emulator
 OS : ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
 Build-host-os : ubuntu-32
 Install-dependency : emulator-qemu-x86, emulator-tools-common
@@ -24,23 +24,39 @@ Source : meta-emulator-tools
 Description : Tizen Emulator provides a full system Tizen runtime environment to develop Tizen applications and platforms without real physical devices.
 Attribute : root
 
-Package : tizen-2.0-emulator-image
-Label : Platform Image
+Package : tizen-2.1-emulator-image-x86
+Label : x86 Platform Image
 OS : ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
 Build-host-os : ubuntu-32
-Install-dependency : emulator-image-2.0-x86
+Install-dependency : emulator-image-2.1-x86
+Conflicts : tizen-2.0-emulator-image-x86
 Source : meta-emulator-tools
 Description : Platform image provides the file system image of Tizen platform for Tizen x86 Emulator.
-<<<<<<< HEAD
-Attribute : root
-=======
 Attribute : root
 
-Package : tizen-2.0-emulator-image-partner
-Label : Platform Image
+#Package : tizen-emulator-tools-arm
+#Label : ARM Emulator
+#OS : ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
+#Build-host-os : ubuntu-32
+#Install-dependency : emulator-qemu-arm, emulator-tools-common
+#Source : meta-emulator-tools
+#Description : Tizen Emulator provides a full system Tizen runtime environment to develop Tizen applications and platforms without real physical devices.
+#Attribute : root
+
+#Package : tizen-2.0-emulator-image-arm
+#Label : ARM Platform Image
+#OS : ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
+#Build-host-os : ubuntu-32
+#Install-dependency : emulator-image-2.0-arm
+#Source : meta-emulator-tools
+#Description : Platform image provides the file system image of Tizen platform for Tizen ARM Emulator.
+#Attribute : root
+
+Package : tizen-emulator-test
+Label : Emulator Test
 OS : ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
 Build-host-os : ubuntu-32
-Install-dependency : emulator-image-2.0-x86-partner
+Install-dependency : emulator-test
 Source : meta-emulator-tools
-Description : Platform image for partners provides the file system image of Tizen platform for Tizen Emulator.
->>>>>>> sunae-meta-emulator-tools
+Description : Emulator test package verifies that Tizen Emulator works correctly for all features using tools and scripts.
+Attribute : root