Update license, place elf in /usr/bin

4 files changed, 20 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a64ee0d9de5e..1604436692e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = adtrack2-bin
 	pkgdesc = OPL3 music tracker
 	pkgver = 2.4.24
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.adlibtracker.net
 	arch = x86_64
-	license = custom
+	license = custom:freeware
 	depends = sdl2
 	source = http://www.adlibtracker.net/files/adtrack-2.4.24-linux-bin-debian-stretch-x86.tar.gz
 	source = adtrack2.sh
 	source = adtrack2.desktop
-	source = LICENSE.html::http://www.adlibtracker.net/programfaq.php
+	source = LICENSE
 	sha256sums = fdfbb29ae5da944d082a1d33331532745bdfca92acea67eabeae3ff446ec8b17
-	sha256sums = e8554514c56872d1baf2aceb513249b873e2745eba5448816c06b2a41087603e
+	sha256sums = 5ab9050335471e8bd7d8c5c3da8c646d3b47dabef404d4e3cdab23ca3423a03e
 	sha256sums = c6393a8159cdb8e2de29c82930cb19d5532aa38ab5e4b81d4baf0fac4580fcbf
-	sha256sums = 21dbd102eb17ab90526d03b831d5ec463c8284f75b665766c1dab61697f15f5a
+	sha256sums = c38f322ecc2ebc88c1c775614543fbc6acad72ec13cb9ff6c023c3f5247de39f
 
 pkgname = adtrack2-bin
 
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000000..b66ed8552556
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,6 @@
+# License
+
+From the [FAQ](http://www.adlibtracker.net/programfaq.php):
+
+Q: Is AT2 freeware?
+A: Yes, it can be freely used, shared, spread, whatever - as much as you like, and as long as it makes you having a good time. :-)
diff --git a/PKGBUILD b/PKGBUILD
index 8270c584c750..0d36f570d2fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,24 +2,24 @@
 
 pkgname=adtrack2-bin
 pkgver=2.4.24
-pkgrel=2
+pkgrel=3
 pkgdesc="OPL3 music tracker"
 arch=(x86_64)
 url="http://www.adlibtracker.net"
-license=(custom)
+license=('custom:freeware')
 depends=(sdl2)
 source=("http://www.adlibtracker.net/files/adtrack-2.4.24-linux-bin-debian-stretch-x86.tar.gz"
         adtrack2.sh
         adtrack2.desktop
-        'LICENSE.html::http://www.adlibtracker.net/programfaq.php')
+        LICENSE)
 sha256sums=('fdfbb29ae5da944d082a1d33331532745bdfca92acea67eabeae3ff446ec8b17'
-            'e8554514c56872d1baf2aceb513249b873e2745eba5448816c06b2a41087603e'
+            '5ab9050335471e8bd7d8c5c3da8c646d3b47dabef404d4e3cdab23ca3423a03e'
             'c6393a8159cdb8e2de29c82930cb19d5532aa38ab5e4b81d4baf0fac4580fcbf'
-            '21dbd102eb17ab90526d03b831d5ec463c8284f75b665766c1dab61697f15f5a')
+            'c38f322ecc2ebc88c1c775614543fbc6acad72ec13cb9ff6c023c3f5247de39f')
 
 package() {
   cd "adtrack-$pkgver-linux-bin-debian-stretch-x86"
-  install -Dm755 adtrack2 "$pkgdir/usr/share/adtrack2/adtrack2"
+  install -Dm755 adtrack2 "$pkgdir/usr/bin/adtrack2.elf"
   install -Dm755 adtrack2.ini "$pkgdir/usr/share/adtrack2/adtrack2.ini"
   install -Dm755 "$srcdir/adtrack2.sh" "$pkgdir/usr/bin/adtrack2"
   install -Dm644 revision.txt "$pkgdir/usr/share/doc/adtrack2/changelog.txt"
@@ -27,6 +27,6 @@ package() {
   chmod -R a+rX "$pkgdir/usr/share/adtrack2"
   install -Dm644 adtrack2.png "$pkgdir/usr/share/pixmaps/adtrack2.png"
   install -Dm644 "$srcdir/adtrack2.desktop" \
-    "$pkgdir/usr/share/applications/adtrack2.desktop"
-  install -Dm644 "$srcdir/LICENSE.html" "$pkgdir/usr/share/licenses/adtrack2/LICENSE.html"
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/adtrack2.sh b/adtrack2.sh
index ba87736ddd04..e4f81f8be1f8 100644..100755
--- a/adtrack2.sh
+++ b/adtrack2.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 cd /usr/share/adtrack2
-./adtrack2 /cfg:sdl_screen_mode=2 /cfg:sdl_frame_rate=150
+/usr/bin/adtrack2.elf /cfg:sdl_screen_mode=2 /cfg:sdl_frame_rate=150