pkgrel=4: Correct license

Previous license was applet license, not that for the software in this package.
Added EULA and cloned as text to display EULA terms in package preparation.

4 files changed, 42 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4daee1d5ee4f..3439a236e5f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Fri Feb  5 21:51:54 UTC 2016
 pkgbase = xflux
 	pkgdesc = (f.lux for X) Changes monitor color temperature adaptively to ease eye strain (command-line version)
 	pkgver = 20130901
-	pkgrel = 3
+	pkgrel = 4
 	url = https://justgetflux.com/
 	arch = i686
 	arch = x86_64
@@ -9,8 +11,10 @@ pkgbase = xflux
 	depends = gcc-libs
 	depends = libxxf86vm
 	depends = x-server
-	source = COPYING
-	sha256sums = 1ae33693bd6865ee48656b4a4fe6ebbbd3bf588b9130d6fc38b162fed7e7b925
+	source = f.lux-eula.txt
+	source = f.lux-eula.html::https://justgetflux.com/news/pages/eula/index.html
+	sha256sums = 1d989851f6f02a2eb280faec1e3bbb348ba9a5d1677da22fa89dfc02cb063030
+	sha256sums = 76eaf1d3fba40574a344ca7e11d0a86de6dc5bfd0ba6e9d50ff2c08decc3ab06
 	source_i686 = https://justgetflux.com/linux/xflux-pre.tgz
 	sha256sums_i686 = fda5d10c3ca16ba38eddc5fbdecebeccd607c4c95787b4379d1ab372760877b4
 	source_x86_64 = https://justgetflux.com/linux/xflux64.tgz
diff --git a/COPYING b/COPYING
deleted file mode 100644
index f1f4b938d1c1..000000000000
--- a/COPYING
+++ /dev/null
@@ -1,26 +0,0 @@
-f.lux - Better lightning for your computer
-Copyright 2009 - 2010 Michael and Lorna Herf
-
-f.lux indicator applet Copyright (c) 2010 Kilian Valkhof
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
diff --git a/PKGBUILD b/PKGBUILD
index 547866f7f82c..6973ff9ccf8b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,34 @@
 # Contributor: Limao Luo <luolimao+AUR@gmail.com>
 # Contributor: Gadget3000 <gadget3000@msn.com>
 # Contributor: CaptainShanks <captainshanks@archlinux.us>
+# Contributor: deusstultus <deusstultus@gmail.com>
 
 pkgname=xflux
 pkgver=20130901
-pkgrel=3
+pkgrel=4
 pkgdesc="(f.lux for X) Changes monitor color temperature adaptively to ease eye strain (command-line version)"
 arch=('i686' 'x86_64')
 url="https://justgetflux.com/"
 license=('custom')
 depends=('gcc-libs' 'libxxf86vm' 'x-server')
-source=(COPYING)
+source=('f.lux-eula.txt' 'f.lux-eula.html::https://justgetflux.com/news/pages/eula/index.html')
 source_i686=('https://justgetflux.com/linux/xflux-pre.tgz')
 source_x86_64=('https://justgetflux.com/linux/xflux64.tgz')
-sha256sums=('1ae33693bd6865ee48656b4a4fe6ebbbd3bf588b9130d6fc38b162fed7e7b925')
+sha256sums=('1d989851f6f02a2eb280faec1e3bbb348ba9a5d1677da22fa89dfc02cb063030'
+            '76eaf1d3fba40574a344ca7e11d0a86de6dc5bfd0ba6e9d50ff2c08decc3ab06'
+)
 sha256sums_i686=('fda5d10c3ca16ba38eddc5fbdecebeccd607c4c95787b4379d1ab372760877b4')
 sha256sums_x86_64=('cc50158fabaeee58c331f006cc1c08fd2940a126e99d37b76c8e878ef20c2021')
 
+#EULA compliance
+#EULA agreement found in original form at https://justgetflux.com/news/pages/eula/
+prepare() {
+    cat $srcdir/f.lux-eula.txt
+    #read -p "Continue?"
+}
+
 package() {
     install -Dm775 $pkgname "$pkgdir"/usr/bin/$pkgname
-    install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+    install -Dm644 f.lux-eula.html "$pkgdir"/usr/share/licenses/$pkgname/f.lux-eula.html
+    install -Dm644 f.lux-eula.txt "$pkgdir"/usr/share/licenses/$pkgname/f.lux-eula.txt
 }
diff --git a/f.lux-eula.txt b/f.lux-eula.txt
new file mode 100644
index 000000000000..a44f87d611f1
--- /dev/null
+++ b/f.lux-eula.txt
@@ -0,0 +1,20 @@
+f.lux End User License Agreement
+
+BY CLICKING ON THE “ACCEPT” OR “DOWNLOAD” BUTTON, “YOU” (MEANING YOU PERSONALLY AND NOT A COMPANY OR OTHER CORPORATE ENTITY) ARE CONSENTING TO BE BOUND BY AND ARE BECOMING A PARTY TO THIS LICENSE AGREEMENT (“AGREEMENT”). IF YOU DO NOT AGREE TO ALL OF THE TERMS OF THIS AGREEMENT, CLICK THE “CANCEL” BUTTON AND THE DOWNLOAD/INSTALLATION PROCESS WILL NOT CONTINUE. IF THESE TERMS ARE CONSIDERED AN OFFER, ACCEPTANCE IS EXPRESSLY LIMITED TO THESE TERMS.
+
+GRANT. Subject to your full compliance with all the terms of this Agreement, Flux Software LLC (“Company”) hereby grants you (and only you) a limited, personal, non-sublicensable, non-transferable, royalty-free, nonexclusive license to use internally the software that you are about to download or install (“Software”) only in accordance with the Company documentation that accompanies it. In addition to any compatible personal devices, you may download and install the Software on any compatible work device(s) provided that you (1) obtain all necessary permissions, consents and waivers from your employer to do so, (2) assume all risks and liabilities relating to the Software on such devices, and (3) require your employer to release Company from any and all liability to Company relating to the download, installation, or use of the Software.
+
+RESTRICTIONS. You may not (and agree not to, and not authorize or enable others to), directly or indirectly: (a) copy, distribute, redistribute, rent, lease, mirror, timeshare, operate a service bureau, or otherwise use for the benefit of a third party, the Software; (b) disassemble, decompile, attempt to discover the source code or structure, sequence and organization of, or otherwise reverse engineer, the Software (except to the extent applicable law prohibits restrictions on reverse engineering); (c) remove any proprietary notices from the Software; or (d) bundle the Software with any third party software, product or service. You understand that Company may modify or discontinue offering the Software at any time. For the avoidance of doubt, the foregoing restrictions apply to any company or corporate entity (or its affiliates or agents acting on its behalf) (each, an “Entity”) and no Entity shall download or install the Software for the purposes of mirroring or distributing it to its employees or otherwise.
+
+SUPPORT AND UPGRADES. This Agreement does not entitle you to any support, upgrades, patches, enhancements, or fixes for the Software (collectively, “Support”). The Software may automatically download and install updates from time to time on the device(s) that you have downloaded and installed the Software on. You agree to receive any such updates and any Support and/or updates for the Software that may be made available by Company shall become part of the Software and subject to this Agreement. The Company reserves the right in its sole discretion to cease the support of older versions of the Software.
+
+INDEMNITY. You shall indemnify and hold harmless Company from any claims, damages, liabilities, costs and fees (including reasonable attorney fees) arising from your use of the Software as well as from your failure to comply with any term of this Agreement.
+
+WARRANTY DISCLAIMER. YOU AGREE THAT YOU ARE USING THE SOFTWARE SOLELY AT YOUR OWN RISK. COMPANY PROVIDES THE SOFTWARE “AS IS” AND WITHOUT WARRANTY OF ANY KIND, AND COMPANY FOR ITSELF AND ITS PUBLISHERS AND LICENSORS HEREBY DISCLAIMS ALL EXPRESS OR IMPLIED WARRANTIES, INCLUDING WITHOUT LIMITATION WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, PERFORMANCE, ACCURACY, RELIABILITY, AND NON-INFRINGEMENT. YOU ACKNOWLEDGE THAT COMPANY EXPRESSLY DISCLAIMS USE OF THE SOFTWARE FOR ANY MEDICAL PURPOSE (INCLUDING, WITHOUT LIMITATION, THE DIAGNOSIS, EXAMINATION, OR TREATMENT OF ANY MEDICAL CONDITIONS). COMPANY DISCLAIMS ANY REPRESENTATIONS OR WARRANTIES REGARDING THE SOFTWARE MADE BY YOU OR ANY THIRD PARTY AND ANY SUCH REPRESENTATION OR WARRANTY IS NOT MADE ON COMPANY’S BEHALF. Company disclaims any and all liability to you, your employer, or any third party relating to the download, installation, or use of the Software in violation of the foregoing.
+
+LIMITATION OF LIABILITY. COMPANY SHALL NOT BE RESPONSIBLE OR LIABLE WITH RESPECT TO ANY SUBJECT MATTER OF THIS AGREEMENT UNDER ANY CONTRACT, NEGLIGENCE, STRICT LIABILITY OR OTHER THEORY (A) FOR LOSS OR INACCURACY OF DATA OR (EXCEPT FOR RETURN OF AMOUNTS, IF ANY, PAID TO COMPANY BY YOU HEREUNDER) COST OF PROCUREMENT OF SUBSTITUTE GOODS, SERVICES OR TECHNOLOGY, OR (B) FOR ANY INDIRECT, INCIDENTAL OR CONSEQUENTIAL DAMAGES INCLUDING, BUT NOT LIMITED TO LOSS OF REVENUES AND LOSS OF PROFITS. COMPANY SHALL NOT BE RESPONSIBLE FOR ANY MATTER BEYOND ITS REASONABLE CONTROL. THE FOREGOING LIMITATIONS SHALL APPLY EVEN IF COMPANY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. SOME STATES DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THE ABOVE LIMITATION AND EXCLUSION MAY NOT APPLY TO YOU.
+
+TERMINATION. You may terminate this Agreement and the license granted herein at any time by destroying or removing from all computers, networks, and storage media all copies of the Software. Company may terminate this Agreement and the license granted herein immediately if you breach any provision of this Agreement or at any time for any or no reason. Upon receiving notice of termination from Company you will destroy or remove from all computers, networks, and storage media all copies of the Software. Sections 2 through 8 shall survive termination of this Agreement.
+
+MISCELLANEOUS. You shall comply with all applicable export laws, restrictions and regulations in connection with your use of the Software, and will not export or re-export the Software in violation thereof. As defined in FAR section 2.101, DFAR section 252.227-7014(a)(1) and DFAR section 252.227-7014(a)(5) or otherwise, all Software and accompanying documentation provided by Company are “commercial items,” “commercial computer software” and/or “commercial computer software documentation.” Consistent with DFAR section 227.7202 and FAR section 12.212, any use, modification, reproduction, release, performance, display, disclosure or distribution thereof by or for the U.S. Government shall be governed solely by these terms and shall be prohibited except to the extent expressly permitted by these terms. This Agreement is personal to you and you shall not assign or transfer the Agreement or the Software to any third party under any circumstances; Company may assign or transfer this Agreement without consent. This Agreement represents the complete agreement concerning this license between the parties and supersedes all prior agreements and representations between them. It may be amended only by a writing executed by both parties. If any provision of this Agreement is held to be unenforceable for any reason, such provision shall be reformed only to the extent necessary to make it enforceable. This Agreement shall be governed by and construed under New York law without regard to any conflicts of law provisions thereof.
+