summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Gibyoung <lastkgb.kim@samsung.com>2013-04-29 07:48:54 (GMT)
committerKim Gibyoung <lastkgb.kim@samsung.com>2013-04-29 08:00:11 (GMT)
commit38f0fa4f2c35443c26150d2b6ee0c092f9a8e6bd (patch)
treef6f32e0116a76f60a81534cfdf6d0769fab2b51b
parent333563dc3e00cf3a8cd78161d4df5b731dedf48f (diff)
downloadug-wifi-direct-38f0fa4f2c35443c26150d2b6ee0c092f9a8e6bd.zip
ug-wifi-direct-38f0fa4f2c35443c26150d2b6ee0c092f9a8e6bd.tar.gz
ug-wifi-direct-38f0fa4f2c35443c26150d2b6ee0c092f9a8e6bd.tar.bz2
License file updated
Change-Id: I2e740b6e3addb16be2fe7b15ff98abe0503f30d9
-rw-r--r--LICENSE.Flora26
-rwxr-xr-xdebian/changelog9
-rwxr-xr-xpackaging/libug-setting-wifidirect-efl.spec2
3 files changed, 22 insertions, 15 deletions
diff --git a/LICENSE.Flora b/LICENSE.Flora
index fd90a36..4a0af40 100644
--- a/LICENSE.Flora
+++ b/LICENSE.Flora
@@ -1,6 +1,6 @@
Flora License
-Version 1.0, April, 2013
+Version 1.1, April, 2013
http://floralicense.org/license/
@@ -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
@@ -192,7 +192,7 @@ identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
- Licensed under the Flora License, Version 1.0 (the "License");
+ Licensed under the Flora License, Version 1.1 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
diff --git a/debian/changelog b/debian/changelog
index 017beab..d9df28e 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
+ug-setting-wifidirect-efl (1.0.17) precise; urgency=low
+
+ * Flora license file updated
+ * Git: rsa/apps/home/ug-wifi-direct
+ * Tag: libug-setting-wifidirect-efl_1.0.17
+
+ -- Gibyoung Kim <laskgb.kim@samsung.com> Mon, 29 Apr 2013 16:35:15 +0900
ug-setting-wifidirect-efl (1.0.16) precise; urgency=low
* Prevent issue fixed
* Git: rsa/apps/home/ug-wifi-direct
* Tag: libug-setting-wifidirect-efl_1.0.16
- -- Gibyoung Kim <laskgb.kim@samsung.com> Mon, 23 Apr 2013 23:04:05 +0900
+ -- Gibyoung Kim <laskgb.kim@samsung.com> Tue, 23 Apr 2013 23:04:05 +0900
ug-setting-wifidirect-efl (1.0.15) precise; urgency=low
diff --git a/packaging/libug-setting-wifidirect-efl.spec b/packaging/libug-setting-wifidirect-efl.spec
index ae3fe11..aa7e241 100755
--- a/packaging/libug-setting-wifidirect-efl.spec
+++ b/packaging/libug-setting-wifidirect-efl.spec
@@ -3,7 +3,7 @@
Name: libug-setting-wifidirect-efl
Summary: Wi-Fi Direct setting UI gadget
-Version: 1.0.16
+Version: 1.0.17
Release: 1
Group: TO_BE_FILLED
License: Flora License