Merge branch 'tizen_2.4_develop' into tizen_2.4

Conflicts:
	package/changelog
	package/emulator-qemu-x86.install.ubuntu-32
	package/emulator-qemu-x86.install.ubuntu-64
	package/pkginfo.manifest
	tizen/src/scripts/emulator-ifup-linux.sh
	tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java

Change-Id: I17040c2184e80a84c1da01710b280c1c705c3783

diff --cc package/2.4-emulator-qemu-x86.remove.ubuntu-32
index 0000000000000000000000000000000000000000,d40b9f10a52d8a9e1c042aa18f9e72e3baa8ab00..ed7e7ef62ed0412b91f413f5c16710038f14d51d
mode 000000,100755..100755
--- /dev/null
--- 2/package/2.4-emulator-qemu-x86.remove.ubuntu-32
+++ b/package/2.4-emulator-qemu-x86.remove.ubuntu-32
@@@ -1,0 -1,58 +1,58 @@@
 -      $TSUDO -m "${TSUDO_MSG}" sh ${TMP_PATH}
+ #!/bin/bash -ex
+ 
+ TIZEN_KVM_SCRIPT="/etc/init.d/tizen-kvm-multi"
+ if [ -f ${TIZEN_KVM_SCRIPT} ]
+ then
+       echo "tizen-kvm-multi does exist. tizen-kvm does not need to be uninstalled."
+       exit 0;
+ fi
+ 
+ TIZEN_SDK_INSTALL_PATH=`echo ${INSTALLED_PATH}`
+ if [ -z ${TIZEN_SDK_INSTALL_PATH} ]
+ then
+ #   echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log
+    exit 2;
+ fi
+ 
+ LSB_RELEASE=`which lsb_release`
+ if [ "${LSB_RELEASE}" = "" ]; then
+       if [ -e /etc/os-release ]; then
+               OS_NAME=`cat /etc/os-release | grep ID | head -n 1 | awk -F= '{print $2}'`
+       fi
+       # TODO: Detect other linux distributions.
+ else
+       OS_NAME=`lsb_release --id --short`
+ fi
+ 
+ if [ ! -z "${OS_NAME}" ]; then
+       OS_NAME=`echo ${OS_NAME} | tr '[:upper:]' '[:lower:]'`
+ fi
+ echo "Linux Distribution: ${OS_NAME}"
+ 
+ TMP_FILE=remove_tizen-kvm.sh
+ echo "#!/bin/bash -ex" >> ${TMP_FILE}
+ if [ "ubuntu" = "${OS_NAME}" ] ; then
+       echo "update-rc.d -f tizen-kvm remove" >> ${TMP_FILE}
+ fi
+ echo "rm -f /etc/init.d/tizen-kvm" >> ${TMP_FILE}
+ echo "rm -f /lib/udev/rules.d/45-tizen-kvm.rules" >> ${TMP_FILE}
+ 
+ chmod +x ${TMP_FILE}
+ 
+ if [ "${TSUDO}" != "" ] # since installer v2.27
+ then
+       TSUDO_MSG="Enter your password to remove /etc/init.d/tizen-kvm."
+       TMP_PATH="`pwd`/${TMP_FILE}"
++      $TSUDO -m "${TSUDO_MSG}" bash ${TMP_PATH}
+ else
+       GKSUDO=`which gksudo`
+       if [ "${GKSUDO}" = "" ]
+       then
+               echo "there is no gksudo."
+               sudo ./${TMP_FILE}
+       else
+               gksudo ./${TMP_FILE}
+       fi
+ fi
+ 
+ rm ${TMP_FILE}

diff --cc package/2.4-emulator-qemu-x86.remove.ubuntu-64
index 0000000000000000000000000000000000000000,d40b9f10a52d8a9e1c042aa18f9e72e3baa8ab00..ed7e7ef62ed0412b91f413f5c16710038f14d51d
mode 000000,100755..100755
--- /dev/null
--- 2/package/2.4-emulator-qemu-x86.remove.ubuntu-64
+++ b/package/2.4-emulator-qemu-x86.remove.ubuntu-64
@@@ -1,0 -1,58 +1,58 @@@
 -      $TSUDO -m "${TSUDO_MSG}" sh ${TMP_PATH}
+ #!/bin/bash -ex
+ 
+ TIZEN_KVM_SCRIPT="/etc/init.d/tizen-kvm-multi"
+ if [ -f ${TIZEN_KVM_SCRIPT} ]
+ then
+       echo "tizen-kvm-multi does exist. tizen-kvm does not need to be uninstalled."
+       exit 0;
+ fi
+ 
+ TIZEN_SDK_INSTALL_PATH=`echo ${INSTALLED_PATH}`
+ if [ -z ${TIZEN_SDK_INSTALL_PATH} ]
+ then
+ #   echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log
+    exit 2;
+ fi
+ 
+ LSB_RELEASE=`which lsb_release`
+ if [ "${LSB_RELEASE}" = "" ]; then
+       if [ -e /etc/os-release ]; then
+               OS_NAME=`cat /etc/os-release | grep ID | head -n 1 | awk -F= '{print $2}'`
+       fi
+       # TODO: Detect other linux distributions.
+ else
+       OS_NAME=`lsb_release --id --short`
+ fi
+ 
+ if [ ! -z "${OS_NAME}" ]; then
+       OS_NAME=`echo ${OS_NAME} | tr '[:upper:]' '[:lower:]'`
+ fi
+ echo "Linux Distribution: ${OS_NAME}"
+ 
+ TMP_FILE=remove_tizen-kvm.sh
+ echo "#!/bin/bash -ex" >> ${TMP_FILE}
+ if [ "ubuntu" = "${OS_NAME}" ] ; then
+       echo "update-rc.d -f tizen-kvm remove" >> ${TMP_FILE}
+ fi
+ echo "rm -f /etc/init.d/tizen-kvm" >> ${TMP_FILE}
+ echo "rm -f /lib/udev/rules.d/45-tizen-kvm.rules" >> ${TMP_FILE}
+ 
+ chmod +x ${TMP_FILE}
+ 
+ if [ "${TSUDO}" != "" ] # since installer v2.27
+ then
+       TSUDO_MSG="Enter your password to remove /etc/init.d/tizen-kvm."
+       TMP_PATH="`pwd`/${TMP_FILE}"
++      $TSUDO -m "${TSUDO_MSG}" bash ${TMP_PATH}
+ else
+       GKSUDO=`which gksudo`
+       if [ "${GKSUDO}" = "" ]
+       then
+               echo "there is no gksudo."
+               sudo ./${TMP_FILE}
+       else
+               gksudo ./${TMP_FILE}
+       fi
+ fi
+ 
+ rm ${TMP_FILE}

diff --cc package/pkginfo.manifest
Simple merge

diff --cc tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
Simple merge