From: sunil85.kim <sunil85.kim@samsung.com>
Date: Thu, 2 May 2013 04:46:16 +0000 (+0900)
Subject: Update for tizen_2.1
X-Git-Tag: submit/tizen_2.1/20130514.055318~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4edc616cf32511944713ceb5727539675e6d9071;p=apps%2Fnative%2Fug-wifi-efl.git

Update for tizen_2.1

Change-Id: I63c84a481e632e297a504cfc34d1d7a2b0c97e9b
---

diff --git a/LICENSE.Flora b/LICENSE.Flora
index 03f0c77..571fe79 100644
--- a/LICENSE.Flora
+++ b/LICENSE.Flora
@@ -119,17 +119,17 @@ Object form, provided that You meet the following conditions:
      Derivative Works; or, within a display generated by the Derivative Works,
      if and wherever such third-party notices normally appear.
      The contents of the NOTICE file are for informational purposes only
-     and do not modify the License.
-
-You may add Your own attribution notices within Derivative Works
-that You distribute, alongside or as an addendum to the NOTICE text
-from the Work, provided that such additional attribution notices
-cannot be construed as modifying the License. You may add Your own
-copyright statement to Your modifications and may provide additional or
-different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works
-as a whole, provided Your use, reproduction, and distribution of
-the Work otherwise complies with the conditions stated in this License.
+     and do not modify the License. You may add Your own attribution notices 
+     within Derivative Works that You distribute, alongside or as an addendum 
+     to the NOTICE text from the Work, provided that such additional attribution 
+     notices cannot be construed as modifying the License. You may add Your own
+     copyright statement to Your modifications and may provide additional or
+     different license terms and conditions for use, reproduction, or
+     distribution of Your modifications, or for any such Derivative Works
+     as a whole, provided Your use, reproduction, and distribution of
+     the Work otherwise complies with the conditions stated in this License
+     and your own copyright statement or terms and conditions do not conflict
+     the conditions stated in the License including section 3.
 
 5. Submission of Contributions. Unless You explicitly state otherwise,
 any Contribution intentionally submitted for inclusion in the Work
diff --git a/NOTICE b/NOTICE
index f37f329..2c574b9 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
 Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Flora License, Version 1.
+Except as noted, this software is licensed under Flora License, Version 1.1
 Please, see the LICENSE.Flora file for Flora License terms and conditions.
 
diff --git a/debian/changelog b/debian/changelog
index 023cb3c..070ce2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wifi-efl-ug (0.5.2-14ubuntu1) precise; urgency=low
+
+  * Update for license #2
+  * Git: magnolia/apps/home/ug-wifi-efl
+  * Tag: wifi-efl-ug_0.5.2-15
+
+ -- sunil85.kim <isurit@sunil85.kim>  Thu, 02 May 2013 11:53:01 +0900
+
 wifi-efl-ug (0.5.2-14) precise; urgency=low
 
   * [N_SE-36723] Added notification state check function
diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec
index 6b50f3d..83a5a68 100644
--- a/packaging/wifi-efl-ug.spec
+++ b/packaging/wifi-efl-ug.spec
@@ -1,6 +1,6 @@
 Name:       wifi-efl-ug
 Summary:    Wi-Fi UI Gadget
-Version:    0.5.2_14
+Version:    0.5.2_15
 Release:    1
 Group:      App/Network
 License:    Flora License