Update to v0.1.9b

* Update version and hashes
* Add replaces('pico8-bin')
* Add pico_dyn installation for amd64 and i686
* Change @ and . in the maintainer header

2 files changed, 19 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eb4a5112a920..c9fac420cc2e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pico-8
 	pkgdesc = A fantasy console for making, sharing and playing tiny games and other computer programs.
-	pkgver = 0.1.9
+	pkgver = 0.1.9b
 	pkgrel = 1
 	url = http://www.lexaloffle.com/pico-8.php
 	arch = i686
@@ -10,18 +10,19 @@ pkgbase = pico-8
 	license = custom:commercial
 	depends = glibc
 	depends = hicolor-icon-theme
+	replaces = pico8-bin
 	source = pico-8.desktop
 	source = pico-8.xml
 	sha512sums = f63b8f4d32b7183c9785a418c7e8d2ea98343edd90c8553397c7d1776b888eb2b49f0308ec7918bde6c41c9a53b6a00318a533d264fa20e0bbd3d8a9f88c2244
 	sha512sums = 0497c602acbffdbec285ffcdb43ebe55adc793c051ce792933ba2d8d431229f2a938434cd760fbf92133ad6b9604c996b563276166fa883a619cd7313acd4f92
-	source_i686 = hib://pico-8_0.1.9_i386.zip
-	sha512sums_i686 = a22c49e77ed69d24780504ef138a592afc58c7edea57e5dd7d65805c9da9a3cee2e64678d07a7af092b4f3246eb7512bd8a0a9ab8dc6a2e54174f9717c024e07
-	source_x86_64 = hib://pico-8_0.1.9_amd64.zip
-	sha512sums_x86_64 = 453f0061a88405256ab50ca9c2e5b1a4ff22f6a341032734961daa345f7cd20d5225c95291c0e27fba8f51849209eea36f2000fdc89ae555383e5fdab3515481
-	source_armv6h = hib://pico-8_0.1.9_raspi.zip
-	sha512sums_armv6h = 1494dc849707cc85593245c7e119997d9affb7335c642a8469c5b870b09c25330cd7e4a951c35a706e2600151f95ae8ab597783a03c3c79861cb14aa9a597b61
-	source_armv7h = hib://pico-8_0.1.9_raspi.zip
-	sha512sums_armv7h = 1494dc849707cc85593245c7e119997d9affb7335c642a8469c5b870b09c25330cd7e4a951c35a706e2600151f95ae8ab597783a03c3c79861cb14aa9a597b61
+	source_i686 = hib://pico-8_0.1.9b_i386.zip
+	sha512sums_i686 = 4b68f5ae1bb72fbdee5050603071823cce6e833301aa6863260f6499e34012e59b9b5cfd14369dbaf61a6fa20fc3e7dbf26d943ac4f8b2cb0ff761ab643888fd
+	source_x86_64 = hib://pico-8_0.1.9b_amd64.zip
+	sha512sums_x86_64 = cbfcbb5de747f26917bbb72fafbadfab2126ec9b3a7cac452f166901998621412ffa6071d2b94b26a5d66c2d4dea3789c51e184c59632fc3509e7005a422ea00
+	source_armv6h = hib://pico-8_0.1.9b_raspi.zip
+	sha512sums_armv6h = 515720d08090145a83af0475730df681fd2f71741bd23197b1a40930d7e1aec8f7167b0c68d110fe059dcb4b8f78040f27c990c6cd4cae4efd0de110796aa717
+	source_armv7h = hib://pico-8_0.1.9b_raspi.zip
+	sha512sums_armv7h = 515720d08090145a83af0475730df681fd2f71741bd23197b1a40930d7e1aec8f7167b0c68d110fe059dcb4b8f78040f27c990c6cd4cae4efd0de110796aa717
 
 pkgname = pico-8
 
diff --git a/PKGBUILD b/PKGBUILD
index ab30a9362139..b606d063faa4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,15 @@
-# Maintainer: Adam Scott (scottmada) <ascott.ca@gmail.com>
+# Maintainer: Adam Scott (scottmada) <ascott.ca at gmail dot com>
 
 # Common metadata
 pkgname='pico-8'
-pkgver='0.1.9'
+pkgver='0.1.9b'
 pkgrel=1
 pkgdesc="A fantasy console for making, sharing and playing tiny games and other computer programs."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="http://www.lexaloffle.com/pico-8.php"
 license=('custom:commercial')
 depends=('glibc' 'hicolor-icon-theme')
+replaces=('pico8-bin')
 
 # Lexaloffle uses other terms for architecture
 _arch_i686="i386"
@@ -25,9 +26,9 @@ _file_zip_arm="pico-8_${pkgver}_${_arch_arm}.zip"
 # Source files hashes (SHA-512)
 _file_desktop_hash="f63b8f4d32b7183c9785a418c7e8d2ea98343edd90c8553397c7d1776b888eb2b49f0308ec7918bde6c41c9a53b6a00318a533d264fa20e0bbd3d8a9f88c2244"
 _file_mime_hash="0497c602acbffdbec285ffcdb43ebe55adc793c051ce792933ba2d8d431229f2a938434cd760fbf92133ad6b9604c996b563276166fa883a619cd7313acd4f92"
-_file_zip_i686_hash="a22c49e77ed69d24780504ef138a592afc58c7edea57e5dd7d65805c9da9a3cee2e64678d07a7af092b4f3246eb7512bd8a0a9ab8dc6a2e54174f9717c024e07"
-_file_zip_x86_64_hash="453f0061a88405256ab50ca9c2e5b1a4ff22f6a341032734961daa345f7cd20d5225c95291c0e27fba8f51849209eea36f2000fdc89ae555383e5fdab3515481"
-_file_zip_arm_hash="1494dc849707cc85593245c7e119997d9affb7335c642a8469c5b870b09c25330cd7e4a951c35a706e2600151f95ae8ab597783a03c3c79861cb14aa9a597b61"
+_file_zip_i686_hash="4b68f5ae1bb72fbdee5050603071823cce6e833301aa6863260f6499e34012e59b9b5cfd14369dbaf61a6fa20fc3e7dbf26d943ac4f8b2cb0ff761ab643888fd"
+_file_zip_x86_64_hash="cbfcbb5de747f26917bbb72fafbadfab2126ec9b3a7cac452f166901998621412ffa6071d2b94b26a5d66c2d4dea3789c51e184c59632fc3509e7005a422ea00"
+_file_zip_arm_hash="515720d08090145a83af0475730df681fd2f71741bd23197b1a40930d7e1aec8f7167b0c68d110fe059dcb4b8f78040f27c990c6cd4cae4efd0de110796aa717"
 
 # Source declaration
 source=("${_file_desktop}" "${_file_mime}")
@@ -51,10 +52,8 @@ sha512sums_armv7h=("${_file_zip_arm_hash}")
 
 # Prepares sources for building
 prepare () {
-  # As for version 0.1.9, the amd64 release is the only one with a subfolder named pico-8
-  if [ "${_platform}" = "${_arch_x86_64}" ]; then
-    mv "./pico-8/"* .
-  fi
+  # Moves content of the subfolder named pico-8 to src root
+  mv "./pico-8/"* .
 
   # Changes licence and icon filenames in order to comply naming conventions
   mv "license.txt" "LICENSE"
@@ -97,15 +96,11 @@ package () {
   local _pico8_mime="${_file_mime}"
   local _pico8_desktop="${_file_desktop}"
 
-  # The raspi release is now the only one to ship with pico8_dyn
-  if [ "${_platform}" = "${_arch_arm}" ]; then
-    install -Dm644 "${_pico8_dyn}" "${_pkg_opt}/${_pico8_dyn}"
-  fi
-
   # Installs the extracted files
   install -Dm644 "${_pico8_license}" "${_pkg_licenses}/${_pico8_license}"
   install -Dm755 "${_pico8_bin}" "${_pkg_opt}/${_pico8_bin}"
   install -Dm644 "${_pico8_dat}" "${_pkg_opt}/${_pico8_dat}"
+  install -Dm644 "${_pico8_dyn}" "${_pkg_opt}/${_pico8_dyn}"
   install -Dm644 "${_pico8_txt}" "${_pkg_opt}/${_pico8_txt}"
   install -Dm644 "${_pico8_mime}" "${_pkg_mimepackages}/${_pico8_mime}"
   install -Dm644 "${_pico8_desktop}" "${_pkg_apps}/${_pico8_desktop}"