[ABS] Merge "cmake: fix build break as fixing edc file name" into tizen

Reference: submit/tizen/20160824.040955
Commit id: ed1b44956deb804da589115392ddb8b91b039a7f
Requested by: charles0.kim@samsung.com
SDK rootstrap version: 20160823_2

diff --git a/org.tizen.lockscreen-0.1.0-arm-debug.tpk b/org.tizen.lockscreen-0.1.0-arm-debug.tpk
index a851cf8..14430d2 100644 (file)
Binary files a/org.tizen.lockscreen-0.1.0-arm-debug.tpk and b/org.tizen.lockscreen-0.1.0-arm-debug.tpk differ

diff --git a/org.tizen.lockscreen-0.1.0-arm.tpk b/org.tizen.lockscreen-0.1.0-arm.tpk
index 6ba8514..71814c8 100644 (file)
Binary files a/org.tizen.lockscreen-0.1.0-arm.tpk and b/org.tizen.lockscreen-0.1.0-arm.tpk differ

diff --git a/org.tizen.lockscreen-0.1.0-i386-debug.tpk b/org.tizen.lockscreen-0.1.0-i386-debug.tpk
index ccba5b4..b567e90 100644 (file)
Binary files a/org.tizen.lockscreen-0.1.0-i386-debug.tpk and b/org.tizen.lockscreen-0.1.0-i386-debug.tpk differ

diff --git a/org.tizen.lockscreen-0.1.0-i386.tpk b/org.tizen.lockscreen-0.1.0-i386.tpk
index e590297..921844f 100644 (file)
Binary files a/org.tizen.lockscreen-0.1.0-i386.tpk and b/org.tizen.lockscreen-0.1.0-i386.tpk differ

diff --git a/packaging/org.tizen.lockscreen.spec b/packaging/org.tizen.lockscreen.spec
index 40f95d7..b4e9bbe 100644 (file)
--- a/packaging/org.tizen.lockscreen.spec
+++ b/packaging/org.tizen.lockscreen.spec
@@ -1,6 +1,6 @@
 Name:       org.tizen.lockscreen
-#VCS_FROM:   profile/mobile/apps/native/lockscreen#2e7498824d24bca5bf3e77116eb024412d75f70a
-#RS_Ver:    20160819_2 
+#VCS_FROM:   profile/mobile/apps/native/lockscreen#ed1b44956deb804da589115392ddb8b91b039a7f
+#RS_Ver:    20160823_2 
 Summary:    Lockscreen app
 Version:    0.1.0
 Release:    1
@@ -28,7 +28,7 @@ Requires(post):  /usr/bin/tpk-backend
 %endif
 
 %description
-profile/mobile/apps/native/lockscreen#2e7498824d24bca5bf3e77116eb024412d75f70a
+profile/mobile/apps/native/lockscreen#ed1b44956deb804da589115392ddb8b91b039a7f
 This is a container package which have preload TPK files
 
 %prep