Merge branch 'sdk-develop' into tizen

Conflicts:
	AUTHOR
	package/build.ubuntu-32
	package/changelog
	package/pkginfo.manifest

Change-Id: I38ba8c8a9ea8abe07df0a8aa7d8778c2fc51028a
Signed-off-by: Yeongkyoon Lee <yeongkyoon.lee@samsung.com>

5 files changed, 132 insertions, 29 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.gitignore
diff --git a/AUTHOR b/AUTHOR
index 27057b0..1722483 100644
--- a/AUTHOR
+++ b/AUTHOR
@@ -9,4 +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>
\ 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 5085277..5bfade9 100755
--- a/package/build.ubuntu-32
+++ b/package/build.ubuntu-32
@@ -16,8 +16,14 @@ 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
+#	mkdir -p $SRCDIR/package/tizen-emulator-tools-arm.package.${TARGET_OS}/data
+	mkdir -p $SRCDIR/package/mobile-3.0-meta-emulator-image-x86.package.${TARGET_OS}/data
+	mkdir -p $SRCDIR/package/mobile-3.0-meta-emulator-resources.package.${TARGET_OS}/data
+#	mkdir -p $SRCDIR/package/tizen-2.2-emulator-image-x86.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
+	mkdir -p $SRCDIR/package/tizen-emulator-test-tools.package.${TARGET_OS}/data
 }
 
 [ "$1" = "clean" ] && clean
diff --git a/package/changelog b/package/changelog
index 410a575..c1eb811 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,33 +1,78 @@
-* 1.4.10
+* 1.5.14
+- added mobile-3.0-emulator-qemu-skins dependency
+== GiWoong Kim <giwoong.kim@samsung.com> 2013-09-10
+* 1.5.13
+- add mobile-3.0-emulator-manager-resources
+== jihye1128.kim <jihye1128.kim@samsung.com> 2013-09-04
+* 1.5.12
+- add mobile-3.0-meta-emulator-resources
+== Jinhyung Choi <jinhyung2.choi@samsung.com> 2013-09-04
+* 1.5.10
+- delete mobile-3.0-emulator-image-x86-script package
+== jihye kim <jihye1128.kim@samsung.com> 2013-08-27
+* 1.5.9
+- modify attribute of tizen-emulator-test-tools
+== Jinhyung Choi <jinhyung2.choi@samsung.com> 2013-08-23
+* 1.5.5
+- modify attribute of tizen-emulator-test-tools
+== Sungmin Ha <sungmin82.ha@samsung.com> 2013-08-21
+* 1.5.4
+- modify package name 'tizen-2.2-emulator-image-x86'-> 'mobile-3.0-meta-emulator-image-x86'
+== Sungmin Ha <sungmin82.ha@samsung.com> 2013-08-20
+* 1.5.2
+- change attribute value root -> test
+== jihye kim <jihye1128.kim@samsung.com> 2013-08-05
+* 1.5.1
+- add emulator-control-panel
+== Munkyu Im <munkyu.im@samsung.com> 2013-08-05
+* 1.5.0
+- add dependency mingw32-msys-1.0 for Windows
+== jihye kim <jihye1128.kim@samsung.com> 2013-08-02
+* 1.4.14
+- remove tizen-emulator-test-tools package. move to meta-test
+== jihye kim <jihye1128.kim@samsung.com> 2013-07-30
+* 1.4.13
+- add tizen-emulator-test-tools package for emulator auto test
+== jihye kim <jihye1128.kim@samsung.com> 2013-07-30
+* 1.4.12
+- Added emulator-control-panel install dependency on Ubuntu
+== Jinhyung Choi <jinhyung2.choi@samsung.com> 2013-07-29
+* 1.4.11
 - update package version (2.1 -> 2.2)
 == Sungmin Ha <sungmin82.ha@samsung.com> 2013-06-12
-* 1.4.9
+* 1.4.10
 - emulator image version up (2.1 -> 2.2)
 == jihye kim <jihye1128.kim@samsung.com> 2013-06-10
-* 1.4.8
-- removed an unnecessary field in the build script.
-== Kitae Kim <kt920.kim@samsung.com> 2013-03-18
-* 1.4.7
-- update tizen_2.0 to tizen_2.1 on build script
-== Kitae Kim <kt920.kim@samsung.com> 2013-03-15
-* 1.4.6
+* 1.4.9
 - update emulator-image version.
 == Kitae Kim <kt920.kim@samsung.com> 2013-03-14
-* 1.4.5
+* 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 (eventinjector-cli) on Windows and Mac.
-== Kitae Kim <kt920.kim@samsung.com> 2013-01-08
+- 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
-- Removed emulator-test from meta packages.
-== Kitae Kim <kt920.kim@samsung.com> 2012-12-07
+- 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
-- Added some packages which are emulator-test and intelhaxm into meta packages.
-== Kitae Kim <kt920.kim@samsung.com> 2012-12-06
+- 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.
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index b9088e7..c97d1b5 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,22 +1,22 @@
-Version : 1.4.10
-Maintainer : Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
+Version: 1.5.14
+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, version-manager
+Install-dependency : emulator-qemu-common, emulator-manager, emulator-storages, emulator-lib, sdb, eventinjector-cli, emulator-control-panel, 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, version-manager
+Install-dependency : emulator-qemu-common, emulator-manager, emulator-storages, emulator-lib, sdb, eventinjector-cli, intelhaxm, version-manager, emulator-control-panel
 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,12 +24,64 @@ 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.2-emulator-image
-Label : Platform Image
+Package : mobile-3.0-meta-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.2-x86
-Conflicts : tizen-2.0-emulator-image, tizen-2.1-emulator-image
+Install-dependency : mobile-3.0-emulator-image-x86, mobile-3.0-meta-emulator-resources
+Conflicts : tizen-2.0-emulator-image-x86, tizen-2.1-emulator-image-x86, tizen-2.2-emulator-image-x86
 Source : meta-emulator-tools
-Description : Platform image provides the file system image of Tizen platform for Tizen x86 Emulator.
+Description : Platform image provides the file system image of Tizen platform and core resources for Tizen x86 Emulator. 
 Attribute : root
+
+Package : mobile-3.0-meta-emulator-resources
+Label : Emulator Resources
+OS : ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
+Build-host-os : ubuntu-32
+Install-dependency : emulator-tools-common, mobile-3.0-emulator-control-panel-devices, mobile-3.0-emulator-manager-resources, mobile-3.0-emulator-qemu-skins
+Description : Emulator resources provides full features of Emulator Manager, Emulator Control Panel and target specific skin for Tizen Emulator.
+
+#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-test
+Source : meta-emulator-tools
+Description : Emulator test package verifies that Tizen Emulator works correctly for all features using tools and scripts.
+Attribute : test
+
+Package : tizen-emulator-test-tools
+Label : Emulator Test Tools
+OS : ubuntu-32, ubuntu-64, macos-64
+Build-host-os : ubuntu-32
+Install-dependency : emulator-test-tools, emulator-test-resources, emulator-qemu-x86, emulator-tools-common
+Source : meta-emulator-tools
+Description : Emulator test package verifies that Tizen Emulator works correctly for all features using tools and scripts.
+Attribute : test
+
+Package : tizen-emulator-test-tools
+Label : Emulator Test Tools
+OS : windows-32, windows-64
+Build-host-os : ubuntu-32
+Install-dependency : emulator-test-tools, emulator-test-resources,  emulator-qemu-x86, emulator-tools-common, mingw32-msys-1.0
+Source : meta-emulator-tools
+Description : Emulator test package verifies that Tizen Emulator works correctly for all features using tools and scripts.
+Attribute : test