Merge branch 'master' into devel

Change-Id: Icb33675a10834315944ddc5e5711857086facf4e

diff --cc Build.pm
Simple merge

diff --cc build
index 80571bfa2e7446c1ff01c59ed80d3cf34633db61,ea39ae0a9b6cdf0a0723be70174ba85e1920218e..500bd8a54bc7f1de1891cbd5c89e588c79d3ce9b
--- 1/build
--- 2/build
+++ b/build
@@@ -487,16 -422,11 +422,16 @@@ setupccache() 
      fi
  }
  
 -setupicecream() {
 -    if test "$icecream" -eq 0 ; then
 -      rm -rf "$BUILD_ROOT/var/run/icecream"
 +setupicecream()
 +{
 +    local icecreamdir="/var/run/icecream"
 +    if test `readlink "$BUILD_ROOT/var/run"` = '/run' ; then
 +        icecreamdir="/run/icecream"
 +    fi
 +    if [ "$icecream" -eq 0 ]; then
 +      rm -rf "$BUILD_ROOT$icecreamdir"
        rm -f "$BUILD_ROOT/etc/profile.d/build_icecream.sh"
-       return
+       return 0
      fi
  
      if ! chroot "$BUILD_ROOT" rpm -q icecream >/dev/null 2>/dev/null; then
@@@ -523,26 -452,23 +457,25 @@@
        -o "$BUILD_ROOT/usr/bin/gcc" -nt "$BUILD_ROOT/$icecc_vers" \
        -o "$BUILD_ROOT/usr/bin/g++" -nt "$BUILD_ROOT/$icecc_vers" \
        -o "$BUILD_ROOT/usr/bin/as" -nt "$BUILD_ROOT/$icecc_vers" \
-       -o "$BUILD_ROOT/lib/libc.so.6" -nt "$BUILD_ROOT/$icecc_vers" ]
+       -o "$BUILD_ROOT/lib/libc.so.6" -nt "$BUILD_ROOT/$icecc_vers"
      then
 -      rm -rf "$BUILD_ROOT/var/run/icecream"
 -      mkdir -p "$BUILD_ROOT/var/run/icecream"
 -      if test -e "$BUILD_ROOT"/usr/bin/create-env ; then
 -          createenv=/usr/bin/create-env
 -      elif test -e "$BUILD_ROOT"/usr/lib/icecc/icecc-create-env ; then
 -          createenv="/usr/lib/icecc/icecc-create-env /usr/bin/gcc /usr/bin/g++" # XXX
 -      elif test -e "$BUILD_ROOT"/usr/lib64/icecc/icecc-create-env ; then
 -          createenv="/usr/lib64/icecc/icecc-create-env /usr/bin/gcc /usr/bin/g++" # XXX
 +      rm -rf "$BUILD_ROOT$icecreamdir"
 +      mkdir -p "$BUILD_ROOT$icecreamdir"
 +      if [ -e "$BUILD_ROOT"/usr/bin/create-env ]; then
 +        createenv=/usr/bin/create-env
 +      elif [ -e "$BUILD_ROOT"/usr/lib/icecc/icecc-create-env ]; then
 +        createenv="/usr/lib/icecc/icecc-create-env /usr/bin/gcc /usr/bin/g++" # XXX
 +      elif [ -e "$BUILD_ROOT"/usr/lib64/icecc/icecc-create-env ]; then
 +        createenv="/usr/lib64/icecc/icecc-create-env /usr/bin/gcc /usr/bin/g++" # XXX
        else
-         echo "create-env not found"
-         false
-         return
+           echo "create-env not found"
+           return 1
        fi
 -      chroot $BUILD_ROOT bash -c "cd /var/run/icecream; $createenv" || cleanup_and_exit 1
 -      icecc_vers=(`shopt -s nullglob; echo $BUILD_ROOT/var/run/icecream/*.tar.{bz2,gz}`)
 +        echo "creating new env in '$icecreamdir'"
 +      chroot $BUILD_ROOT bash -c "cd $icecreamdir; $createenv" || cleanup_and_exit 1
 +      icecc_vers=(`shopt -s nullglob; echo $BUILD_ROOT/$icecreamdir/*.tar.{bz2,gz}`)
        icecc_vers=${icecc_vers//$BUILD_ROOT/}
 +      echo "created icecream environment $icecc_vers"
      else
        echo "reusing existing icecream environment $icecc_vers"
      fi

diff --cc debian/changelog
index c44d629513affb03ec6b86457a8692eb48320cd2,f16624feb0e5f56b5368c112a5c0fecabf9b5222..e42479378738de4fc85703ec5fee50129f4cbae8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,9 @@@
- build (2015.01.15-tizen20160315) unstable; urgency=high
+ build (20150115-tizen20160302) unstable; urgency=high
  
-   * just update version to 2015.01.15 
- 
-  -- Jiankang Fan <jiankang.fan@samsung.com>  Tue, 15 Mar 2016 19:30:22 +0200
+   * update to version 20150115
  
+  -- Fan Jiankang <jiankang.fan@samsung.com>  Wed, 2 Mar 2016 19:30:22 +0200
  
 -
  build (2013.11.12-tizen20140815) unstable; urgency=high
  
    * update to version 2013.11.12