[M40 Beta] Setup Tizen Beta branch beta/m40_2214_t

Base chromium version is 40.0.2214.38 from linux beta channel.
Downstream patches have been rebased onto it.

Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=9805

Change-Id: I7bfb0545f8f77cd1eaa893833ad6d4cd20ba9c08
Signed-off-by: SeungSeop Park <sns.park@samsung.com>

diff --git a/tizen_src/VERSION b/tizen_src/VERSION
index c39e29f..a2efc71 100644 (file)
--- a/tizen_src/VERSION
+++ b/tizen_src/VERSION
@@ -1 +1 @@
-Chromium upsteam version: 40.0.2214.0
+Chromium upsteam version: 40.0.2214.38

diff --git a/tizen_src/ewk/efl_integration/pkgconfig/chromium-ewk.pc b/tizen_src/ewk/efl_integration/pkgconfig/chromium-ewk.pc
index 127777d..047f170 100644 (file)
--- a/tizen_src/ewk/efl_integration/pkgconfig/chromium-ewk.pc
+++ b/tizen_src/ewk/efl_integration/pkgconfig/chromium-ewk.pc
@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: chromium-ewk
 Description: EWK API based on chromium-efl engine
-Version: 40.2214.0.47-1
+Version: 40.2214.38.51-1
 Requires: chromium-efl
 Libs: -L${libdir} -lchromium-ewk
 Cflags: -I${includedir}/chromium-ewk

diff --git a/tizen_src/ewk/efl_webview_app/chromium-efl.xml b/tizen_src/ewk/efl_webview_app/chromium-efl.xml
index f800904..68b99e6 100644 (file)
--- a/tizen_src/ewk/efl_webview_app/chromium-efl.xml
+++ b/tizen_src/ewk/efl_webview_app/chromium-efl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="chromium-efl" version="40.2214.0.47">
+<manifest xmlns="http://tizen.org/ns/packages" package="chromium-efl" version="40.2214.38.51">
     <label> mini browser application for chromium-efl package </label>
     <author href="www.samsung.com" email="sns.park@samsung.com">SWC</author>
     <description> mini browser application based on chromium-efl </description>

diff --git a/tizen_src/packaging/chromium-efl.spec b/tizen_src/packaging/chromium-efl.spec
index e9d9a3a..697139b 100755 (executable)
--- a/tizen_src/packaging/chromium-efl.spec
+++ b/tizen_src/packaging/chromium-efl.spec
@@ -10,8 +10,8 @@
 Name: chromium-efl
 Summary: Chromium EFL
 # Set by by scripts/update-chromium-version.sh
-%define ChromiumVersion 40.2214.0
-%define Week 47
+%define ChromiumVersion 40.2214.38
+%define Week 51
 Version: %{ChromiumVersion}.%{Week}
 Release: 1
 Group: Applications/Internet

diff --git a/tizen_src/packaging/manifest.xml b/tizen_src/packaging/manifest.xml
index f0528ff..400d4ea 100644 (file)
--- a/tizen_src/packaging/manifest.xml
+++ b/tizen_src/packaging/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Manifest xmlns="http://schemas.tizen.org/2012/12/manifest">
     <Id>kmcele1k1p</Id>
-    <Version>40.2214.0.47</Version>
+    <Version>40.2214.38.51</Version>
     <Type>C++App</Type>
     <Descriptions>
         <Description Locale="eng-PH"/>

diff --git a/tizen_src/sync_repos.sh b/tizen_src/sync_repos.sh
index e3dc1fa..17863d2 100755 (executable)
--- a/tizen_src/sync_repos.sh
+++ b/tizen_src/sync_repos.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BRANCH=dev/m40_2214
+BRANCH=beta/m40_2214_t
 URLBASE=$(git ls-remote --get-url)
 if echo "$@" | grep -c "\-\-reset" &> /dev/null; then
   isReset=1