Merge branch 'develop' into release

Conflicts:
	package/changelog
	package/pkginfo.manifest

diff --cc package/build.ubuntu-32
index b03d8357f4a59ca5263b4e9f71b393bebd1e3939,0bbaebcbc16dae0c88917cbb57d40814258b6151..cf150fc935bb3f2a183c741b8f0f5acf0cf1dfad
--- 1/package/build.ubuntu-32
--- 2/package/build.ubuntu-32
+++ b/package/build.ubuntu-32
@@@ -11,17 -11,31 +11,31 @@@ clean(
  # build
  build()
  {
-       make i386_emul_defconfig
-       make
+       # x86 kernel
+       make ARCH=i386 i386_tizen_emul_defconfig
+       make ARCH=i386 -j4
+ 
 -      ARM_TOOLCHAIN=`which arm-linux-gnueabi-gcc`
 -      if [ $ARM_TOOLCHAIN = "" ]
 -      then
 -              echo "There is no a toolchain for arm."
 -              exit 1
 -      fi
++#     ARM_TOOLCHAIN=`which arm-linux-gnueabi-gcc`
++#     if [ $ARM_TOOLCHAIN = "" ]
++#     then
++#             echo "There is no a toolchain for arm."
++#             exit 1
++#     fi
+       # arm kernel
 -      make ARCH=arm arm_tizen_emul_defconfig
 -      make -j4 ARCH=arm CROSS_COMPILE=arm-linux-gnueabi-
++#     make ARCH=arm arm_tizen_emul_defconfig
++#     make -j4 ARCH=arm CROSS_COMPILE=arm-linux-gnueabi-
  }
  
  # install
  install()
  {
-       BIN_DIR=$SRCDIR/package/emulator-kernel-x86.package.${TARGET_OS}/data/tools/emulator/data/kernel
-       mkdir -p $BIN_DIR
+       X86_BIN_DIR=$SRCDIR/package/emulator-kernel-x86.package.${TARGET_OS}/data/tools/emulator/data/kernel
 -      ARM_BIN_DIR=$SRCDIR/package/emulator-kernel-arm.package.${TARGET_OS}/data/tools/emulator/data/kernel
++#     ARM_BIN_DIR=$SRCDIR/package/emulator-kernel-arm.package.${TARGET_OS}/data/tools/emulator/data/kernel
+       mkdir -p $X86_BIN_DIR
 -      mkdir -p $ARM_BIN_DIR
++#     mkdir -p $ARM_BIN_DIR
  
-       cp arch/x86/boot/bzImage $BIN_DIR/bzImage.x86
+       cp arch/x86/boot/bzImage $X86_BIN_DIR/bzImage.x86
 -      cp arch/arm/boot/zImage $ARM_BIN_DIR/bzImage.arm
++#     cp arch/arm/boot/zImage $ARM_BIN_DIR/bzImage.arm
  }
  
  [ "$1" = "clean" ] && clean

diff --cc package/changelog
index a7fba908f14f5e13ef00bfbf819a8907943053ae,83695b5c6d06b15151d74361ce4d4e9984a9d72a..c50607a8107239478c5515930ac07938d53ae3fe
--- 1/package/changelog
--- 2/package/changelog
+++ b/package/changelog
@@@ -1,4 -1,15 +1,19 @@@
 -* 1.3.21
++* 1.4.0
++- Merge develop into release branch.
++- Some features or bug fixes are merged from develop.
++== Kitae Kim <kt920.kim@samsung.com> 2012-11-02
+ * 1.3.24
+ - The range of brightness level has been changed.(1 ~ 24 => 0 ~ 100)
+ == Jinhyung.jo <jinhyung.jo@samsung.com> 2012-10-31
+ * 1.3.23
+ - Modify dibs build script for arm package.
+ - Since arm toolchain has been installed on build environment, kernel source can support arm package.
+ == Kitae Kim <kt920.kim@samsung.com> 2012-10-31
+ * 1.3.22
+ - Merge tizen_arm branch into develop branch.
+ - Merge arm kernel source for emulator into x86 kernel source.
+ == Kitae Kim <kt920.kim@samsung.com> 2012-10-30
 +* 1.3.20
  - Change kernel keycode of KEY_MENU.
  - Since X key mapping has been changed, kernel keycode has to be changed.
  == GiWoong Kim <giwoong.kim@samsung.com> 2012-10-23

diff --cc package/pkginfo.manifest
index 5fbbe46abb532e5c944cb68c2d18f339edf28f7c,c4e474249bbc2921431266e7646845f7e5b51775..128051ca981dd8242a0cbb56f8239e53a6b0527e
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,7 -1,13 +1,13 @@@
 -Version: 1.3.24
++Version: 1.4.0
+ Maintainer: Yeong-Kyoon, Lee <yeongkyoon.lee@samsung.com>
+ Source: emulator-kernel
+ 
  Package: emulator-kernel-x86
- Version: 1.3.20
  OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
  Build-host-os: ubuntu-32
- Maintainer: Yeong-Kyoon, Lee <yeongkyoon.lee@samsung.com>
- Source: emulator-kernel
- Description: Tizen Emulator Kernel
+ Description: Tizen x86 Emulator Kernel
+ 
 -Package: emulator-kernel-arm
 -OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
 -Build-host-os: ubuntu-32
 -Description: Tizen ARM Emulator Kernel
++#Package: emulator-kernel-arm
++#OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
++#Build-host-os: ubuntu-32
++#Description: Tizen ARM Emulator Kernel