Merge branch 'develop' into platform_2.4

Conflicts:
	package/pkginfo.manifest

Change-Id: Ic1aee836bada48354a5864b37f1855ccdbf721b6
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

diff --cc package/pkginfo.manifest
index 117bf7be0ed5266c89b7a306a0956aa16283876a,186630d66ac6e142553f18c24a0ceb8d3103972d..f287cc47874d48e5906d3884212323353719f18d
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -22,99 -22,99 +22,99 @@@ OS: macos-6
  Build-host-os: macos-64
  Description: Common binaries for Tizen Emulator
  
 -Package: 3.0-emulator-qemu-x86
 +Package: 2.4-emulator-qemu-x86
  OS: ubuntu-32
  Build-host-os: ubuntu-32
 -Build-dependency: 3.0-emulator-lib-dev [ ubuntu-32 ], 3.0-libav-dev [ ubuntu-32 ]
 -Install-dependency: 3.0-emulator-kernel-x86 [ ubuntu-32 ], 3.0-libav [ ubuntu-32 ]
 +Build-dependency: 2.4-emulator-lib-dev [ ubuntu-32 ], 2.4-libav-dev [ ubuntu-32 ]
 +Install-dependency: 2.4-emulator-kernel-x86 [ ubuntu-32 ], 2.4-libav [ ubuntu-32 ]
- C-Prerequisites: libsdl1.2debian, libglib2.0-0, acl, zlib1g, libpixman-1-0, bridge-utils, openvpn
+ C-Prerequisites: acl, bridge-utils, openvpn, libfontconfig1, libglib2.0-0, libjpeg-turbo8, libpixman-1-0, libpng12-0, libsdl1.2debian, libsm6, libv4l-0, libx11-xcb1, libxcb-icccm4, libxcb-image0, libxcb-randr0, libxcb-render-util0, libxcb-shape0, libxcb-xfixes0, libxi6
  Description: Tizen x86 Emulator
  
 -Package: 3.0-emulator-qemu-x86
 +Package: 2.4-emulator-qemu-x86
  OS: ubuntu-64
  Build-host-os: ubuntu-64
 -Build-dependency: 3.0-emulator-lib-dev [ ubuntu-64 ], 3.0-libav-dev [ ubuntu-64]
 -Install-dependency: 3.0-emulator-kernel-x86 [ ubuntu-64 ], 3.0-libav [ ubuntu-64 ]
 +Build-dependency: 2.4-emulator-lib-dev [ ubuntu-64 ], 2.4-libav-dev [ ubuntu-64]
 +Install-dependency: 2.4-emulator-kernel-x86 [ ubuntu-64 ], 2.4-libav [ ubuntu-64 ]
- C-Prerequisites: libsdl1.2debian, libglib2.0-0, acl, zlib1g, libpixman-1-0, bridge-utils, openvpn
+ C-Prerequisites: acl, bridge-utils, openvpn, libfontconfig1, libglib2.0-0, libjpeg-turbo8, libpixman-1-0, libpng12-0, libsdl1.2debian, libsm6, libv4l-0, libx11-xcb1, libxcb-icccm4, libxcb-image0, libxcb-randr0, libxcb-render-util0, libxcb-shape0, libxcb-xfixes0, libxi6
  Description: Tizen x86 Emulator
  
 -Package: 3.0-emulator-qemu-x86
 +Package: 2.4-emulator-qemu-x86
  OS: windows-32
  Build-host-os: ubuntu-64
 -Build-dependency: 3.0-emulator-lib-dev [ windows-32 ], 3.0-libav-dev [ windows-32 ]
 -Install-dependency: 3.0-emulator-kernel-x86, 3.0-libav
 +Build-dependency: 2.4-emulator-lib-dev [ windows-32 ], 2.4-libav-dev [ windows-32 ]
 +Install-dependency: 2.4-emulator-kernel-x86, 2.4-libav
  Description: Tizen x86 Emulator
  
 -Package: 3.0-emulator-qemu-x86
 +Package: 2.4-emulator-qemu-x86
  OS: windows-64
  Build-host-os: ubuntu-64
 -Build-dependency: 3.0-emulator-lib-dev [ windows-64 ], 3.0-libav-dev [ windows-64 ]
 -Install-dependency: 3.0-emulator-kernel-x86, 3.0-libav
 +Build-dependency: 2.4-emulator-lib-dev [ windows-64 ], 2.4-libav-dev [ windows-64 ]
 +Install-dependency: 2.4-emulator-kernel-x86, 2.4-libav
  Description: Tizen x86 Emulator
  
 -Package: 3.0-emulator-qemu-x86
 +Package: 2.4-emulator-qemu-x86
  OS: macos-64
  Build-host-os: macos-64
 -Build-dependency: 3.0-emulator-lib-dev [ macos-64 ], 3.0-libav-dev [ macos-64 ]
 -Install-dependency: cocoasudo [ macos-64 ], 3.0-emulator-kernel-x86 [ macos-64 ], 3.0-libav [ macos-64 ], tuntaposx [ macos-64 ]
 +Build-dependency: 2.4-emulator-lib-dev [ macos-64 ], 2.4-libav-dev [ macos-64 ]
 +Install-dependency: cocoasudo [ macos-64 ], 2.4-emulator-kernel-x86 [ macos-64 ], 2.4-libav [ macos-64 ], tuntaposx [ macos-64 ]
  Description: Tizen x86 Emulator
  
 -Package: mobile-3.0-emulator-qemu-skins
 +Package: mobile-2.4-emulator-qemu-skins
  OS: ubuntu-32
  Build-host-os: ubuntu-32
 -Description: Skin images for Mobile 3.0 Tizen Emulator
 +Description: Skin images for Mobile 2.4 Tizen Emulator
  
 -Package: mobile-3.0-emulator-qemu-skins
 +Package: mobile-2.4-emulator-qemu-skins
  OS: ubuntu-64
  Build-host-os: ubuntu-64
 -Description: Skin images for Mobile 3.0 Tizen Emulator
 +Description: Skin images for Mobile 2.4 Tizen Emulator
  
 -Package: mobile-3.0-emulator-qemu-skins
 +Package: mobile-2.4-emulator-qemu-skins
  OS: windows-32, windows-64
  Build-host-os: ubuntu-64
 -Description: Skin images for Mobile 3.0 Tizen Emulator
 +Description: Skin images for Mobile 2.4 Tizen Emulator
  
 -Package: mobile-3.0-emulator-qemu-skins
 +Package: mobile-2.4-emulator-qemu-skins
  OS: macos-64
  Build-host-os: macos-64
 -Description: Skin images for Mobile 3.0 Tizen Emulator
 +Description: Skin images for Mobile 2.4 Tizen Emulator
  
 -Package: wearable-3.0-emulator-qemu-skins
 +Package: wearable-2.4-emulator-qemu-skins
  OS: ubuntu-32
  Build-host-os: ubuntu-32
 -Description: Skin images for Wearable 3.0 Tizen Emulator
 +Description: Skin images for Wearable 2.4 Tizen Emulator
  
 -Package: wearable-3.0-emulator-qemu-skins
 +Package: wearable-2.4-emulator-qemu-skins
  OS: ubuntu-64
  Build-host-os: ubuntu-64
 -Description: Skin images for Wearable 3.0 Tizen Emulator
 +Description: Skin images for Wearable 2.4 Tizen Emulator
  
 -Package: wearable-3.0-emulator-qemu-skins
 +Package: wearable-2.4-emulator-qemu-skins
  OS: windows-32, windows-64
  Build-host-os: ubuntu-64
 -Description: Skin images for Wearable 3.0 Tizen Emulator
 +Description: Skin images for Wearable 2.4 Tizen Emulator
  
 -Package: wearable-3.0-emulator-qemu-skins
 +Package: wearable-2.4-emulator-qemu-skins
  OS: macos-64
  Build-host-os: macos-64
 -Description: Skin images for Wearable 3.0 Tizen Emulator
 +Description: Skin images for Wearable 2.4 Tizen Emulator
  
 -Package: tv-3.0-emulator-qemu-skins
 +Package: tv-2.4-emulator-qemu-skins
  OS: ubuntu-32
  Build-host-os: ubuntu-32
 -Description: Skin images for TV 3.0 Tizen Emulator
 +Description: Skin images for TV 2.4 Tizen Emulator
  
 -Package: tv-3.0-emulator-qemu-skins
 +Package: tv-2.4-emulator-qemu-skins
  OS: ubuntu-64
  Build-host-os: ubuntu-64
 -Description: Skin images for TV 3.0 Tizen Emulator
 +Description: Skin images for TV 2.4 Tizen Emulator
  
 -Package: tv-3.0-emulator-qemu-skins
 +Package: tv-2.4-emulator-qemu-skins
  OS: windows-32, windows-64
  Build-host-os: ubuntu-64
 -Description: Skin images for TV 3.0 Tizen Emulator
 +Description: Skin images for TV 2.4 Tizen Emulator
  
 -Package: tv-3.0-emulator-qemu-skins
 +Package: tv-2.4-emulator-qemu-skins
  OS: macos-64
  Build-host-os: macos-64
 -Description: Skin images for TV 3.0 Tizen Emulator
 +Description: Skin images for TV 2.4 Tizen Emulator