Merge branch 'develop' into tizen_studio_p4.0

Change-Id: I548c140b42edefbd8fe89a9938d59419cbc56766
Signed-off-by: Minkee Lee <minkee.lee@samsung.com>

diff --git a/package/build.common b/package/build.common
index 1527153..ed898d5 100644 (file)
--- a/package/build.common
+++ b/package/build.common
@@ -38,7 +38,7 @@ build_common()
 # install_common
 install_common()
 {
-       TIZEN_VERSIONS="4.0 3.0 2.4 2.3.2"
+       TIZEN_VERSIONS="4.0"
 
        for VER in ${TIZEN_VERSIONS} ; do
                # emulator

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index b8b4911..26a9c4e 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -2,7 +2,6 @@ Version: 2.8.0.2
 Maintainer: SeokYeon Hwang <syeon.hwang@samsung.com>
 Source: emulator
 
-# For tizen 4.0
 Package: 4.0-emulator-qemu-common
 OS: ubuntu-32
 Build-host-os: ubuntu-32
@@ -119,337 +118,3 @@ Package: tv-4.0-emulator-qemu-skins
 OS: macos-64
 Build-host-os: macos-64
 Description: Skin images for TV 4.0 Tizen 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: 4.0-emulator-lib-dev [ ubuntu-32 ], 4.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: 4.0-emulator-lib-dev [ ubuntu-64 ], 4.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: 4.0-emulator-lib-dev [ windows-32 ], 4.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: 4.0-emulator-lib-dev [ windows-64 ], 4.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: 4.0-emulator-lib-dev [ macos-64 ], 4.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
-
-Package: mobile-3.0-emulator-qemu-skins
-OS: ubuntu-32
-Build-host-os: ubuntu-32
-Description: Skin images for Mobile 3.0 Tizen Emulator
-
-Package: mobile-3.0-emulator-qemu-skins
-OS: ubuntu-64
-Build-host-os: ubuntu-64
-Description: Skin images for Mobile 3.0 Tizen Emulator
-
-Package: mobile-3.0-emulator-qemu-skins
-OS: windows-32, windows-64
-Build-host-os: ubuntu-64
-Description: Skin images for Mobile 3.0 Tizen Emulator
-
-Package: mobile-3.0-emulator-qemu-skins
-OS: macos-64
-Build-host-os: macos-64
-Description: Skin images for Mobile 3.0 Tizen Emulator
-
-Package: wearable-3.0-emulator-qemu-skins
-OS: ubuntu-32
-Build-host-os: ubuntu-32
-Description: Skin images for Wearable 3.0 Tizen Emulator
-
-Package: wearable-3.0-emulator-qemu-skins
-OS: ubuntu-64
-Build-host-os: ubuntu-64
-Description: Skin images for Wearable 3.0 Tizen Emulator
-
-Package: wearable-3.0-emulator-qemu-skins
-OS: windows-32, windows-64
-Build-host-os: ubuntu-64
-Description: Skin images for Wearable 3.0 Tizen Emulator
-
-Package: wearable-3.0-emulator-qemu-skins
-OS: macos-64
-Build-host-os: macos-64
-Description: Skin images for Wearable 3.0 Tizen Emulator
-
-Package: tv-3.0-emulator-qemu-skins
-OS: ubuntu-32
-Build-host-os: ubuntu-32
-Description: Skin images for TV 3.0 Tizen Emulator
-
-Package: tv-3.0-emulator-qemu-skins
-OS: ubuntu-64
-Build-host-os: ubuntu-64
-Description: Skin images for TV 3.0 Tizen Emulator
-
-Package: tv-3.0-emulator-qemu-skins
-OS: windows-32, windows-64
-Build-host-os: ubuntu-64
-Description: Skin images for TV 3.0 Tizen Emulator
-
-Package: tv-3.0-emulator-qemu-skins
-OS: macos-64
-Build-host-os: macos-64
-Description: Skin images for TV 3.0 Tizen 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: 4.0-emulator-lib-dev [ ubuntu-32 ], 4.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: 4.0-emulator-lib-dev [ ubuntu-64 ], 4.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: 4.0-emulator-lib-dev [ windows-32 ], 4.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: 4.0-emulator-lib-dev [ windows-64 ], 4.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: 4.0-emulator-lib-dev [ macos-64 ], 4.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
-
-Package: mobile-2.4-emulator-qemu-skins
-OS: ubuntu-32
-Build-host-os: ubuntu-32
-Description: Skin images for Mobile 2.4 Tizen Emulator
-
-Package: mobile-2.4-emulator-qemu-skins
-OS: ubuntu-64
-Build-host-os: ubuntu-64
-Description: Skin images for Mobile 2.4 Tizen Emulator
-
-Package: mobile-2.4-emulator-qemu-skins
-OS: windows-32, windows-64
-Build-host-os: ubuntu-64
-Description: Skin images for Mobile 2.4 Tizen Emulator
-
-Package: mobile-2.4-emulator-qemu-skins
-OS: macos-64
-Build-host-os: macos-64
-Description: Skin images for Mobile 2.4 Tizen Emulator
-
-Package: wearable-2.4-emulator-qemu-skins
-OS: ubuntu-32
-Build-host-os: ubuntu-32
-Description: Skin images for Wearable 2.4 Tizen Emulator
-
-Package: wearable-2.4-emulator-qemu-skins
-OS: ubuntu-64
-Build-host-os: ubuntu-64
-Description: Skin images for Wearable 2.4 Tizen Emulator
-
-Package: wearable-2.4-emulator-qemu-skins
-OS: windows-32, windows-64
-Build-host-os: ubuntu-64
-Description: Skin images for Wearable 2.4 Tizen Emulator
-
-Package: wearable-2.4-emulator-qemu-skins
-OS: macos-64
-Build-host-os: macos-64
-Description: Skin images for Wearable 2.4 Tizen Emulator
-
-Package: tv-2.4-emulator-qemu-skins
-OS: ubuntu-32
-Build-host-os: ubuntu-32
-Description: Skin images for TV 2.4 Tizen Emulator
-
-Package: tv-2.4-emulator-qemu-skins
-OS: ubuntu-64
-Build-host-os: ubuntu-64
-Description: Skin images for TV 2.4 Tizen Emulator
-
-Package: tv-2.4-emulator-qemu-skins
-OS: windows-32, windows-64
-Build-host-os: ubuntu-64
-Description: Skin images for TV 2.4 Tizen Emulator
-
-Package: tv-2.4-emulator-qemu-skins
-OS: macos-64
-Build-host-os: macos-64
-Description: Skin images for TV 2.4 Tizen 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: 4.0-emulator-lib-dev [ ubuntu-32 ], 4.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: 4.0-emulator-lib-dev [ ubuntu-64 ], 4.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: 4.0-emulator-lib-dev [ windows-32 ], 4.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: 4.0-emulator-lib-dev [ windows-64 ], 4.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: 4.0-emulator-lib-dev [ macos-64 ], 4.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
-
-Package: mobile-2.3.2-emulator-qemu-skins
-OS: ubuntu-32
-Build-host-os: ubuntu-32
-Description: Skin images for Mobile 2.3.2 Tizen Emulator
-
-Package: mobile-2.3.2-emulator-qemu-skins
-OS: ubuntu-64
-Build-host-os: ubuntu-64
-Description: Skin images for Mobile 2.3.2 Tizen Emulator
-
-Package: mobile-2.3.2-emulator-qemu-skins
-OS: windows-32, windows-64
-Build-host-os: ubuntu-64
-Description: Skin images for Mobile 2.3.2 Tizen Emulator
-
-Package: mobile-2.3.2-emulator-qemu-skins
-OS: macos-64
-Build-host-os: macos-64
-Description: Skin images for Mobile 2.3.2 Tizen Emulator
-
-Package: wearable-2.3.2-emulator-qemu-skins
-OS: ubuntu-32
-Build-host-os: ubuntu-32
-Description: Skin images for Wearable 2.3.2 Tizen Emulator
-
-Package: wearable-2.3.2-emulator-qemu-skins
-OS: ubuntu-64
-Build-host-os: ubuntu-64
-Description: Skin images for Wearable 2.3.2 Tizen Emulator
-
-Package: wearable-2.3.2-emulator-qemu-skins
-OS: windows-32, windows-64
-Build-host-os: ubuntu-64
-Description: Skin images for Wearable 2.3.2 Tizen Emulator
-
-Package: wearable-2.3.2-emulator-qemu-skins
-OS: macos-64
-Build-host-os: macos-64
-Description: Skin images for Wearable 2.3.2 Tizen Emulator