bump to 2.11.2.0

5 files changed, 29 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fdfc4f1a9a12..1ea1ba4c932d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = jalview
 	pkgdesc = Bioinformatics Multiple Alignment Editor
-	pkgver = 2.11.1.4
+	pkgver = 2.11.2.0
 	pkgrel = 1
 	url = https://www.jalview.org/
 	arch = any
 	license = GPL3
+	makedepends = tar
 	depends = java-runtime
-	noextract = jalview-2_11_1_4-unix-java_8.tar.gz
-	source = http://www.jalview.org/getdown/release/install4j/1.8/jalview-2_11_1_4-unix-java_8.tar.gz
+	noextract = jalview-2_11_2_0-unix-java_8.tar.gz
+	source = http://www.jalview.org/getdown/release/install4j/1.8/jalview-2_11_2_0-unix-java_8.tar.gz
 	source = jalview
 	source = jalview.desktop
-	sha256sums = 32fa6106f3afedf7e60d4b1c8006846903e4cdaa0730190cfea399ab49202c05
-	sha256sums = dbe5edfa9b17a1f85083b5aae16ef7a186a0d0035e6a81761cf73d0e1121ce58
-	sha256sums = d9e0823d3b724d1c373763864d5daf6ebd59d1511347ec461310324afa45448e
+	b2sums = bfd83d1e3cfc691a0e0c81420223968cf7d7358e31a8bf6ed459a87a7dc589e1b805983450c3755524965cd3d89d83197089a12c0dc6087957ba892838c2058c
+	b2sums = e14717693a06411bd9703f8e627ba424f11eefc9640ad60e7deac05be75eaa5615b623bcb95291982735225fc7971e21d49540624b91dd8e597d651ed0cfb526
+	b2sums = 0b7ae3fef150e5f6d2c9ac12abceaab2cf5de9a5ed33005f4aed8c87fc6fad2d1d0d56b37fa46183d7a190020cac7edb1c8e477a92ba58d6bc22fdf87fcb4bc0
 
 pkgname = jalview
-
diff --git a/PKGBUILD b/PKGBUILD
index 17c3ae3db94b..83d6be380330 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,39 @@
-# Maintainer: PumpkinCheshire <sollyonzou at gmail dot com>
+#!/bin/bash
+
+# Maintainer: PumpkinCheshire <me at pumpkincheshire dot com>
 # Contributor: Felix Golatofski <contact@xdfr.de>
 # Contributor: Stefan Seemayer <mail@semicolonsoftware.de>
 
 pkgname=jalview
-pkgver=2.11.1.4
+pkgver=2.11.2.0
 pkgrel=1
-pkgdesc="Bioinformatics Multiple Alignment Editor"
+pkgdesc='Bioinformatics Multiple Alignment Editor'
 arch=(any)
-url="https://www.jalview.org/"
+url='https://www.jalview.org/'
 license=('GPL3')
-depends=(java-runtime)
-source=("http://www.jalview.org/getdown/release/install4j/1.8/jalview-2_11_1_4-unix-java_8.tar.gz"
+depends=('java-runtime')
+makedepends=('tar')
+source=(
+    "http://www.jalview.org/getdown/release/install4j/1.8/jalview-2_11_2_0-unix-java_8.tar.gz"
     'jalview'
-    'jalview.desktop')
-noextract=("jalview-2_11_1_4-unix-java_8.tar.gz")
-sha256sums=('32fa6106f3afedf7e60d4b1c8006846903e4cdaa0730190cfea399ab49202c05'
-    'dbe5edfa9b17a1f85083b5aae16ef7a186a0d0035e6a81761cf73d0e1121ce58'
-    'd9e0823d3b724d1c373763864d5daf6ebd59d1511347ec461310324afa45448e')
+    'jalview.desktop'
+)
+noextract=("jalview-2_11_2_0-unix-java_8.tar.gz")
+b2sums=('bfd83d1e3cfc691a0e0c81420223968cf7d7358e31a8bf6ed459a87a7dc589e1b805983450c3755524965cd3d89d83197089a12c0dc6087957ba892838c2058c'
+        'e14717693a06411bd9703f8e627ba424f11eefc9640ad60e7deac05be75eaa5615b623bcb95291982735225fc7971e21d49540624b91dd8e597d651ed0cfb526'
+        '0b7ae3fef150e5f6d2c9ac12abceaab2cf5de9a5ed33005f4aed8c87fc6fad2d1d0d56b37fa46183d7a190020cac7edb1c8e477a92ba58d6bc22fdf87fcb4bc0')
 
 prepare() {
     mkdir -p ./$pkgname-$pkgver
-    tar -xzvf *.tar.gz -C ./$pkgname-$pkgver --strip-components 1
+    tar -xzvf ./*.tar.gz -C ./$pkgname-$pkgver --strip-components 1
 }
 
 package() {
-    install -Dm755 -t "${pkgdir}/usr/bin/" ${pkgname}
-    install -Dm644 -t $pkgdir/usr/share/applications/ jalview.desktop
+    install -Dm755 -t "$pkgdir/usr/bin/" "$pkgname"
+    install -Dm644 -t "$pkgdir/usr/share/applications/" 'jalview.desktop'
 
     install -Dm644 -t "$pkgdir/usr/share/java/$pkgname" $srcdir/$pkgname-$pkgver/release/*.jar
 
-    install -Dm644 $srcdir/$pkgname-$pkgver/resource/JalviewLogo_Huge.png $pkgdir/usr/share/pixmaps/jalview_logo.png
-    install -Dm644 $srcdir/$pkgname-$pkgver/resource/jalview_logos.ico $pkgdir/usr/share/pixmaps/jalview_logos.ico
+    install -Dm644 "$srcdir/$pkgname-$pkgver/resource/jalview_logo.png" "$pkgdir/usr/share/pixmaps/jalview_logo.png"
+    # install -Dm644 "$srcdir/$pkgname-$pkgver/resource/jalview_logos.ico" "$pkgdir/usr/share/pixmaps/jalview_logos.ico"
 }
diff --git a/jalview b/jalview
index dab8b9d022b0..dab8b9d022b0 100755..100644
--- a/jalview
+++ b/jalview
diff --git a/jalview.desktop b/jalview.desktop
index 2b52f868fcb4..4ce81ce47c8b 100644
--- a/jalview.desktop
+++ b/jalview.desktop
@@ -2,7 +2,7 @@
 Name=Jalview
 Comment=A multiple alignment editor
 Exec=jalview
-Icon=/usr/share/pixmaps/jalview_logos.ico
+Icon=/usr/share/pixmaps/jalview_logos.png
 StartupNotify=true
 Type=Application
 Categories=Education;Science;Bioinformatics;
diff --git a/update_sources.py b/update_sources.py
index 8ef2ca5e7523..8ef2ca5e7523 100755..100644
--- a/update_sources.py
+++ b/update_sources.py