projects / sdk / ide / product.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c45969d)
Upload tizen_2.2 source tizen_2.2 2.2.1_release
authorkh5325.kim <kh5325.kim@samsung.com>
Thu, 24 Oct 2013 08:04:42 +0000 (17:04 +0900)
committerkh5325.kim <kh5325.kim@samsung.com>
Thu, 24 Oct 2013 08:04:42 +0000 (17:04 +0900)
Change-Id: I49fc899f27ef59ac9f06964a65c27487c6ada75e

org.tizen.base.feature/license.html patch | blob | history
org.tizen.base.feature/rootfiles_for_linux/startup.sh patch | blob | history
org.tizen.base.platform/content/home.html patch | blob | history
package/changelog patch | blob | history
package/pkginfo.manifest patch | blob | history

diff --git a/org.tizen.base.feature/license.html b/org.tizen.base.feature/license.html
index c42e289..6d566dc 100644 (file)
--- a/org.tizen.base.feature/license.html
+++ b/org.tizen.base.feature/license.html
@@ -7,21 +7,18 @@
 </head>\r
 \r
 <body lang="EN-US">\r
-               <p align="center">Tizen SDK</p><br /><br />\r
-\r
-Tizen SDK contains software portions licensed under various open source licenses as well as proprietary components.  All open source software portions ("Open Source Software") are licensed under the open source\r
-licenses that accompany such Open Source Software.<br/><br/>\r
-\r
-The licenses governing the Open Source Software are available at:<br />\r
-<a href="https://developer.tizen.org/tizen-sdk-opensource-license">https://developer.tizen.org/tizen-sdk-opensource-license</a><br /><br />\r
+               <p align="center">Tizen SDK</p><br /><br /> \r
+Tizen SDK contains software portions licensed under various open source licenses as well as proprietary components. All software portions ("Software") are licensed under licenses that accompany such Software.<p>\r
  \r
-Except for the Open Source Software and proprietary components contributed from companies other than Samsung, contained in Tizen SDK, all other software portions contained in Tizen SDK are governed by the\r
-terms and conditions of the Samsung Tizen SDK License Agreement, available at:<br />\r
-<a href="https://developer.tizen.org/tizen-sdk-license">https://developer.tizen.org/tizen-sdk-license</a><br /><br />\r
-\r
-The licenses of all proprietary components contributed from companies other than Samsung will be either displayed as part of their respective installers or accessed inside installation package archive of each\r
-component.\r
-\r
-You may access and download Tizen SDK Open Source Software at:<br />\r
-<a href="http://developer.tizen.org/download/tizenopensdk.tar.gz">http://developer.tizen.org/download/tizenopensdk.tar.gz</a><br /><br />\r
-BY CLICKING THE "I AGREE" BUTTON OR BY USING ANY PART OF TIZEN SDK, YOU AGREE (ON BEHALF OF YOURSELF AND/OR YOUR COMPANY) TO THE OPEN SOURCE SOFTWARE LICENSE TERMS, THE SAMSUNG TIZEN SDK LICENSE AGREEMENT AND THE LICENSES OF ALL PROPRIETARY COMPONENTS CONTRIBUTED FROM COMPANIES OTHER THAN SAMSUNG. If you do not agree with the Open Source Software license terms or the SAMSUNG TIZEN SDK LICENSE AGREEMENT or THE LICENSES OF ALL PROPRIETARY COMPONENTS CONTRIBUTED FROM COMPANIES OTHER THAN SAMSUNG, you may not download or use Tizen SDK.\r
+The licenses governing the Software("Licenses") are available at:<br>\r
+<a href="https://developer.tizen.org/tizen-sdk-software-licenses">https://developer.tizen.org/tizen-sdk-software-licenses</a><p>\r
+ \r
+The licenses("Other Licenses") of software which are not listed at the above URL will be either displayed as part of their respective installers or accessed inside installation package archive of each component.<p>\r
+ \r
+You may access and download the Software at:<br>\r
+<a href="http://review.tizen.org/git/">http://review.tizen.org/git/</a><p>\r
+ \r
+BY CLICKING THE "I AGREE" BUTTON OR BY USING ANY PART OF TIZEN SDK, YOU AGREE (ON BEHALF OF YOURSELF AND/OR YOUR COMPANY) TO THE TERMS IN Licenses, AND THE TERMS IN Other Licenses.<br>\r
+If you do not agree with the terms in Licenses or the terms in Other Licenses you may not download or use Tizen SDK.\r
+</body>\r
+</html>\r
diff --git a/org.tizen.base.feature/rootfiles_for_linux/startup.sh b/org.tizen.base.feature/rootfiles_for_linux/startup.sh
index aeae253..6caf8db 100755 (executable)
--- a/org.tizen.base.feature/rootfiles_for_linux/startup.sh
+++ b/org.tizen.base.feature/rootfiles_for_linux/startup.sh
@@ -18,6 +18,11 @@ if [ -e /etc/os-release ]
 then
     id=`cat /etc/os-release | grep "^ID=" | sed "s/^ID=//g"`
     version=`cat /etc/os-release | grep "^VERSION_ID=" | sed "s/^VERSION_ID=//g" | sed "s/\"//g"`
+elif [ -e /etc/issue ] 
+then
+    id=`cat /etc/issue | awk '{print $1}' | tr [A-Z] [a-z]`
+    ubuntu_version=`cat /etc/issue | awk '{print $2}'`
+    version=`expr substr $ubuntu_version 1 5`
 fi
 
 if [ "${id}" = "ubuntu" ]
diff --git a/org.tizen.base.platform/content/home.html b/org.tizen.base.platform/content/home.html
index a9ec23d..5d7865e 100644 (file)
--- a/org.tizen.base.platform/content/home.html
+++ b/org.tizen.base.platform/content/home.html
@@ -27,7 +27,7 @@
                        </a>                            \r
                </div>                                          \r
                <div style=" position:absolute; top:204px; left:347px; ">\r
-                       <a href="http://org.eclipse.ui.intro/showHelpTopic?id=/org.tizen.cpp.appprogramming/html/cover_page.htm">\r
+                       <a href="http://org.eclipse.ui.intro/showHelpTopic?id=/org.tizen.native.appprogramming/html/cover_page.htm">\r
                                <img border="0" src="icon_03_normal.png" alt="Tizen Native Programming" onmouseover="on_03(this)" onmouseout="off_03(this)" />\r
                        </a>                            \r
                </div>                  \r
diff --git a/package/changelog b/package/changelog
index 31d1bf8..a2f38ca 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,15 @@
+* 2.2.6
+- Modify tizen license
+== taeyoung2.son <taeyoung2.son@samsung.com> 2013-09-27 11:52
+* 2.2.5
+- Modify tizen license
+== taeyoung2.son <taeyoung2.son@samsung.com> 2013-09-24 14:53
+* 2.2.4
+- Modify startup.sh
+== taeyoung2.son <taeyoung2.son@samsung.com> 2013-09-03 10:03
+* 2.2.3
+- Fixed a link for Native App Programming
+== kh5325.kim <kh5325.kim@samsung.com> 2013-08-26
 * 2.2.2
 - Changed for non-ubuntu linux
 == kh5325.kim <kh5325.kim@samsung.com> 2013-07-08
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index a6e293a..ce99d73 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:2.2.2
+Version:2.2.6
 Source:product
 Maintainer:kangho kim <kh5325.kim@samsung.com>, yoonki park <yoonki.park@samsung.com>, hyunsik non <hyunsik.noh@samsung.com>, taeyoung son <taeyoung2.son@samsung.com>, gune Kim <gune.kim@samsung.com>, ho namkoong <ho.namkoong@samsung.com>, hyeongseok heo <hyeong-seok.heo@samsung.com>, gyeongseok seo <gyeongseok.seo@samsung.com>, jihoon song<jihoon80.song@samsung.com>, changhyun lee <changhyun1.lee@samsung.com>, Woongsik Choi <woongsik76.choi@samsung.com>, Hyukmin Kwon <hyukmin0530.kwon@samsung.com>, Wooyoung Cho <wooyoung1.cho@samsung.com>, Jaeheung Kim <jaeheung.kim@samsung.com>
 
Domain: SDK / Common IDE;