summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaesub kim <taesub.kim@samsung.com>2017-03-28 19:30:47 +0900
committertaesub kim <taesub.kim@samsung.com>2017-03-28 19:30:51 +0900
commite91adfb3147a042ef5777616ccc1bb3921069568 (patch)
tree46c3f89bc8553d78eb14218334d9350e18c84078
parent8c2ee6bd63612a5d47bc84b7d174b50815d99831 (diff)
downloadnet-popup-accepted/tizen_3.0_ivi.tar.gz
net-popup-accepted/tizen_3.0_ivi.tar.bz2
net-popup-accepted/tizen_3.0_ivi.zip
Change-Id: I8dc22421a5998618720b3dd6a88f63a575b3ba26 Signed-off-by: Taesub Kim <taesub.kim@samsung.com>
-rw-r--r--NOTICE3
-rwxr-xr-xinclude/net-popup-strings.h2
-rwxr-xr-xinclude/net-popup-vpn.h2
-rwxr-xr-xinclude/net-popup.h2
-rwxr-xr-xpackaging/net.netpopup.spec6
-rwxr-xr-xsrc/net-popup-vpn.c2
-rwxr-xr-xsrc/net-popup.c2
7 files changed, 9 insertions, 10 deletions
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..db64ab0
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,3 @@
+Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
+Except as noted, this software is licensed under Flora License, Version 1.1
+Please, see the LICENSE file for Flora License, Version 1.1 terms and conditions.
diff --git a/include/net-popup-strings.h b/include/net-popup-strings.h
index ae02cd1..a454908 100755
--- a/include/net-popup-strings.h
+++ b/include/net-popup-strings.h
@@ -3,7 +3,7 @@
*
* Copyright 2012 Samsung Electronics Co., Ltd
*
-* 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/include/net-popup-vpn.h b/include/net-popup-vpn.h
index a9560f8..20cfc63 100755
--- a/include/net-popup-vpn.h
+++ b/include/net-popup-vpn.h
@@ -3,7 +3,7 @@
*
* Copyright 2012 Samsung Electronics Co., Ltd
*
-* 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/include/net-popup.h b/include/net-popup.h
index d370935..0131d2a 100755
--- a/include/net-popup.h
+++ b/include/net-popup.h
@@ -3,7 +3,7 @@
*
* Copyright 2012 Samsung Electronics Co., Ltd
*
-* 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/packaging/net.netpopup.spec b/packaging/net.netpopup.spec
index 67a2913..1206a84 100755
--- a/packaging/net.netpopup.spec
+++ b/packaging/net.netpopup.spec
@@ -43,10 +43,6 @@ make %{?_smp_mflags}
%install
%make_install
-#License
-mkdir -p %{buildroot}%{_datadir}/license
-cp LICENSE %{buildroot}%{_datadir}/license/net.netpopup
-
%files
%manifest net.netpopup.manifest
@@ -54,4 +50,4 @@ cp LICENSE %{buildroot}%{_datadir}/license/net.netpopup
%{_datadir}/packages/net.netpopup.xml
/usr/ug/res/edje/net-popup/*.edj
%{_datadir}/locale/*/LC_MESSAGES/net-popup.mo
-%{_datadir}/license/net.netpopup
+%license LICENSE
diff --git a/src/net-popup-vpn.c b/src/net-popup-vpn.c
index efea756..44e4411 100755
--- a/src/net-popup-vpn.c
+++ b/src/net-popup-vpn.c
@@ -3,7 +3,7 @@
*
* Copyright 2012 Samsung Electronics Co., Ltd
*
-* 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/src/net-popup.c b/src/net-popup.c
index 2ed0a0f..fe60b39 100755
--- a/src/net-popup.c
+++ b/src/net-popup.c
@@ -3,7 +3,7 @@
*
* Copyright 2012 Samsung Electronics Co., Ltd
*
-* 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
*