Merge "implement TEP install, update" into tizen accepted/tizen/mobile/20151117.005616 accepted/tizen/tv/20151117.005630 accepted/tizen/wearable/20151117.005639 submit/tizen/20151116.110857
authorVBS <jungh.yeon@samsung.com>
Mon, 16 Nov 2015 11:06:12 +0000 (03:06 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 16 Nov 2015 11:06:12 +0000 (03:06 -0800)
1  2 
packaging/app-installers.spec
src/common/CMakeLists.txt
src/common/pkgmgr_interface.cc
src/common/pkgmgr_registration.cc
src/common/pkgmgr_registration.h
src/common/step/step_configure.cc
src/common/utils/file_util.cc
src/common/utils/file_util.h
src/tpk/step/step_parse.cc
src/tpk/tpk_installer.cc

index 6fc198dad8d3f4e20baf29d96b1019fcd5f3f9f2,8057c7d471af5f61d6fb85299c2fca733dda94e3..4e48fa71b92cc7f8a137e97b60027309e0296e16
@@@ -38,8 -38,8 +38,9 @@@ BuildRequires:  pkgconfig(capi-appfw-ap
  
  Requires: ca-certificates-tizen
  Requires: libtzplatform-config
 +Requires: xdelta3
  
  %description
  This is a meta package that installs the common application
  installers of Tizen.
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 2cd62f6994f4549295f5dc06a6239c2d1d2144b0,feee1339fcbc15c7819c32b372bc6dddf0f30105..59a2703a2e011a3fc61f2f74f198735d452ef8d9
@@@ -7,9 -7,9 +7,10 @@@
  #include "common/step/step_create_icons.h"
  #include "common/step/step_create_storage_directories.h"
  #include "common/step/step_copy.h"
+ #include "common/step/step_copy_tep.h"
  #include "common/step/step_copy_backup.h"
  #include "common/step/step_check_old_certificate.h"
 +#include "common/step/step_delta_patch.h"
  #include "common/step/step_fail.h"
  #include "common/step/step_kill_apps.h"
  #include "common/step/step_generate_xml.h"