Merge branch 'tizen' into tizen_studio_3.0_p5.0

Change-Id: If8e8c4073bbff859f2149c74dd9134b21c1ff2b6

diff --cc package/build.common
index 969fafb,7003c52..901236a
--- 1/package/build.common
--- 2/package/build.common
+++ b/package/build.common
@@@ -38,7 -38,7 +38,7 @@@ build_common(
  # install_common
  install_common()
  {
-       TIZEN_VERSIONS="4.0"
 -      TIZEN_VERSIONS="5.0 4.0 3.0 2.4 2.3.2"
++      TIZEN_VERSIONS="5.0"
  
        for VER in ${TIZEN_VERSIONS} ; do
                # emulator

diff --cc package/pkginfo.manifest
index 981e560,fa59594..abcc14a
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -38,24 -39,256 +39,24 @@@ Install-dependency: 5.0-emulator-kernel
  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: 4.0-emulator-qemu-x86
+ Package: 5.0-emulator-qemu-x86
  OS: windows-32
  Build-host-os: ubuntu-64
- Build-dependency: 4.0-emulator-lib-dev [ windows-32 ], 4.0-libav-dev [ windows-32 ]
- Install-dependency: 4.0-emulator-kernel-x86, 4.0-libav
+ Build-dependency: 5.0-emulator-lib-dev [ windows-32 ], 5.0-libav-dev [ windows-32 ]
+ Install-dependency: 5.0-emulator-kernel-x86, 5.0-libav
  Description: Tizen x86 Emulator
  
- Package: 4.0-emulator-qemu-x86
+ Package: 5.0-emulator-qemu-x86
  OS: windows-64
  Build-host-os: ubuntu-64
- Build-dependency: 4.0-emulator-lib-dev [ windows-64 ], 4.0-libav-dev [ windows-64 ]
- Install-dependency: 4.0-emulator-kernel-x86, 4.0-libav
+ Build-dependency: 5.0-emulator-lib-dev [ windows-64 ], 5.0-libav-dev [ windows-64 ]
+ Install-dependency: 5.0-emulator-kernel-x86, 5.0-libav
  Description: Tizen x86 Emulator
  
- Package: 4.0-emulator-qemu-x86
+ Package: 5.0-emulator-qemu-x86
  OS: macos-64
  Build-host-os: macos-64
- Build-dependency: 4.0-emulator-lib-dev [ macos-64 ], 4.0-libav-dev [ macos-64 ]
- Install-dependency: cocoasudo [ macos-64 ], 4.0-emulator-kernel-x86 [ macos-64 ], 4.0-libav [ macos-64 ], tuntaposx [ macos-64 ]
+ Build-dependency: 5.0-emulator-lib-dev [ macos-64 ], 5.0-libav-dev [ macos-64 ]
+ Install-dependency: cocoasudo [ macos-64 ], 5.0-emulator-kernel-x86 [ macos-64 ], 5.0-libav [ macos-64 ], tuntaposx [ macos-64 ]
  Description: Tizen x86 Emulator
  
 -# For tizen 4.0
 -Package: 4.0-emulator-qemu-common
 -OS: ubuntu-32
 -Build-host-os: ubuntu-32
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 4.0-emulator-qemu-common
 -OS: ubuntu-64
 -Build-host-os: ubuntu-64
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 4.0-emulator-qemu-common
 -OS: windows-32, windows-64
 -Build-host-os: ubuntu-64
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 4.0-emulator-qemu-common
 -OS: macos-64
 -Build-host-os: macos-64
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 4.0-emulator-qemu-x86
 -OS: ubuntu-32
 -Build-host-os: ubuntu-32
 -Build-dependency: 5.0-emulator-lib-dev [ ubuntu-32 ], 5.0-libav-dev [ ubuntu-32 ]
 -Install-dependency: 4.0-emulator-kernel-x86 [ ubuntu-32 ], 4.0-libav [ ubuntu-32 ]
 -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: 4.0-emulator-qemu-x86
 -OS: ubuntu-64
 -Build-host-os: ubuntu-64
 -Build-dependency: 5.0-emulator-lib-dev [ ubuntu-64 ], 5.0-libav-dev [ ubuntu-64]
 -Install-dependency: 4.0-emulator-kernel-x86 [ ubuntu-64 ], 4.0-libav [ ubuntu-64 ]
 -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: 4.0-emulator-qemu-x86
 -OS: windows-32
 -Build-host-os: ubuntu-64
 -Build-dependency: 5.0-emulator-lib-dev [ windows-32 ], 5.0-libav-dev [ windows-32 ]
 -Install-dependency: 4.0-emulator-kernel-x86, 4.0-libav
 -Description: Tizen x86 Emulator
 -
 -Package: 4.0-emulator-qemu-x86
 -OS: windows-64
 -Build-host-os: ubuntu-64
 -Build-dependency: 5.0-emulator-lib-dev [ windows-64 ], 5.0-libav-dev [ windows-64 ]
 -Install-dependency: 4.0-emulator-kernel-x86, 4.0-libav
 -Description: Tizen x86 Emulator
 -
 -Package: 4.0-emulator-qemu-x86
 -OS: macos-64
 -Build-host-os: macos-64
 -Build-dependency: 5.0-emulator-lib-dev [ macos-64 ], 5.0-libav-dev [ macos-64 ]
 -Install-dependency: cocoasudo [ macos-64 ], 4.0-emulator-kernel-x86 [ macos-64 ], 4.0-libav [ macos-64 ], tuntaposx [ macos-64 ]
 -Description: Tizen x86 Emulator
 -
 -# For tizen 3.0
 -Package: 3.0-emulator-qemu-common
 -OS: ubuntu-32
 -Build-host-os: ubuntu-32
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 3.0-emulator-qemu-common
 -OS: ubuntu-64
 -Build-host-os: ubuntu-64
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 3.0-emulator-qemu-common
 -OS: windows-32, windows-64
 -Build-host-os: ubuntu-64
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 3.0-emulator-qemu-common
 -OS: macos-64
 -Build-host-os: macos-64
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 3.0-emulator-qemu-x86
 -OS: ubuntu-32
 -Build-host-os: ubuntu-32
 -Build-dependency: 5.0-emulator-lib-dev [ ubuntu-32 ], 5.0-libav-dev [ ubuntu-32 ]
 -Install-dependency: 3.0-emulator-kernel-x86 [ ubuntu-32 ], 3.0-libav [ ubuntu-32 ]
 -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
 -OS: ubuntu-64
 -Build-host-os: ubuntu-64
 -Build-dependency: 5.0-emulator-lib-dev [ ubuntu-64 ], 5.0-libav-dev [ ubuntu-64]
 -Install-dependency: 3.0-emulator-kernel-x86 [ ubuntu-64 ], 3.0-libav [ ubuntu-64 ]
 -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
 -OS: windows-32
 -Build-host-os: ubuntu-64
 -Build-dependency: 5.0-emulator-lib-dev [ windows-32 ], 5.0-libav-dev [ windows-32 ]
 -Install-dependency: 3.0-emulator-kernel-x86, 3.0-libav
 -Description: Tizen x86 Emulator
 -
 -Package: 3.0-emulator-qemu-x86
 -OS: windows-64
 -Build-host-os: ubuntu-64
 -Build-dependency: 5.0-emulator-lib-dev [ windows-64 ], 5.0-libav-dev [ windows-64 ]
 -Install-dependency: 3.0-emulator-kernel-x86, 3.0-libav
 -Description: Tizen x86 Emulator
 -
 -Package: 3.0-emulator-qemu-x86
 -OS: macos-64
 -Build-host-os: macos-64
 -Build-dependency: 5.0-emulator-lib-dev [ macos-64 ], 5.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 ]
 -Description: Tizen x86 Emulator
 -
 -# For tizen 2.4
 -Package: 2.4-emulator-qemu-common
 -OS: ubuntu-32
 -Build-host-os: ubuntu-32
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 2.4-emulator-qemu-common
 -OS: ubuntu-64
 -Build-host-os: ubuntu-64
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 2.4-emulator-qemu-common
 -OS: windows-32, windows-64
 -Build-host-os: ubuntu-64
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 2.4-emulator-qemu-common
 -OS: macos-64
 -Build-host-os: macos-64
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 2.4-emulator-qemu-x86
 -OS: ubuntu-32
 -Build-host-os: ubuntu-32
 -Build-dependency: 5.0-emulator-lib-dev [ ubuntu-32 ], 5.0-libav-dev [ ubuntu-32 ]
 -Install-dependency: 2.4-emulator-kernel-x86 [ ubuntu-32 ], 2.4-libav [ ubuntu-32 ]
 -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: 2.4-emulator-qemu-x86
 -OS: ubuntu-64
 -Build-host-os: ubuntu-64
 -Build-dependency: 5.0-emulator-lib-dev [ ubuntu-64 ], 5.0-libav-dev [ ubuntu-64]
 -Install-dependency: 2.4-emulator-kernel-x86 [ ubuntu-64 ], 2.4-libav [ ubuntu-64 ]
 -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: 2.4-emulator-qemu-x86
 -OS: windows-32
 -Build-host-os: ubuntu-64
 -Build-dependency: 5.0-emulator-lib-dev [ windows-32 ], 5.0-libav-dev [ windows-32 ]
 -Install-dependency: 2.4-emulator-kernel-x86, 2.4-libav
 -Description: Tizen x86 Emulator
 -
 -Package: 2.4-emulator-qemu-x86
 -OS: windows-64
 -Build-host-os: ubuntu-64
 -Build-dependency: 5.0-emulator-lib-dev [ windows-64 ], 5.0-libav-dev [ windows-64 ]
 -Install-dependency: 2.4-emulator-kernel-x86, 2.4-libav
 -Description: Tizen x86 Emulator
 -
 -Package: 2.4-emulator-qemu-x86
 -OS: macos-64
 -Build-host-os: macos-64
 -Build-dependency: 5.0-emulator-lib-dev [ macos-64 ], 5.0-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
 -
 -# For tizen 2.3.2
 -Package: 2.3.2-emulator-qemu-common
 -OS: ubuntu-32
 -Build-host-os: ubuntu-32
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 2.3.2-emulator-qemu-common
 -OS: ubuntu-64
 -Build-host-os: ubuntu-64
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 2.3.2-emulator-qemu-common
 -OS: windows-32, windows-64
 -Build-host-os: ubuntu-64
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 2.3.2-emulator-qemu-common
 -OS: macos-64
 -Build-host-os: macos-64
 -Description: Common binaries for Tizen Emulator
 -
 -Package: 2.3.2-emulator-qemu-x86
 -OS: ubuntu-32
 -Build-host-os: ubuntu-32
 -Build-dependency: 5.0-emulator-lib-dev [ ubuntu-32 ], 5.0-libav-dev [ ubuntu-32 ]
 -Install-dependency: 2.3.2-emulator-kernel-x86 [ ubuntu-32 ], 2.3.2-libav [ ubuntu-32 ]
 -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: 2.3.2-emulator-qemu-x86
 -OS: ubuntu-64
 -Build-host-os: ubuntu-64
 -Build-dependency: 5.0-emulator-lib-dev [ ubuntu-64 ], 5.0-libav-dev [ ubuntu-64]
 -Install-dependency: 2.3.2-emulator-kernel-x86 [ ubuntu-64 ], 2.3.2-libav [ ubuntu-64 ]
 -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: 2.3.2-emulator-qemu-x86
 -OS: windows-32
 -Build-host-os: ubuntu-64
 -Build-dependency: 5.0-emulator-lib-dev [ windows-32 ], 5.0-libav-dev [ windows-32 ]
 -Install-dependency: 2.3.2-emulator-kernel-x86, 2.3.2-libav
 -Description: Tizen x86 Emulator
 -
 -Package: 2.3.2-emulator-qemu-x86
 -OS: windows-64
 -Build-host-os: ubuntu-64
 -Build-dependency: 5.0-emulator-lib-dev [ windows-64 ], 5.0-libav-dev [ windows-64 ]
 -Install-dependency: 2.3.2-emulator-kernel-x86, 2.3.2-libav
 -Description: Tizen x86 Emulator
 -
 -Package: 2.3.2-emulator-qemu-x86
 -OS: macos-64
 -Build-host-os: macos-64
 -Build-dependency: 5.0-emulator-lib-dev [ macos-64 ], 5.0-libav-dev [ macos-64 ]
 -Install-dependency: cocoasudo [ macos-64 ], 2.3.2-emulator-kernel-x86 [ macos-64 ], 2.3.2-libav [ macos-64 ], tuntaposx [ macos-64 ]
 -Description: Tizen x86 Emulator
 -