Merge branch 'dev' into 'master'

Improved handling of the package icon and minor tweaks

See merge request Feakster/java-mango!2

3 files changed, 45 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 80396ecb90e1..238f44d83c55 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,12 @@
 pkgbase = java-mango
 	pkgdesc = A viewer for medical research images
 	pkgver = 4.1
-	pkgrel = 3
+	pkgrel = 4
 	url = http://ric.uthscsa.edu/mango/index.html
 	arch = any
 	license = custom:RII-UTHSCSA
+	makedepends = imagemagick
+	depends = hicolor-icon-theme
 	depends = jre7-openjdk
 	options = !strip
 	source = java-mango-4.1.zip::http://ric.uthscsa.edu/mango/downloads/mango_unix.zip
@@ -14,9 +16,8 @@ pkgbase = java-mango
 	source = LICENSE
 	b2sums = 34ed9385f51cc29560a333abd0509bf2a41ef3db73d5b56d73df9ac8a446575f65f403b62daa8e9d589b9fe1dd720dac66fb56e6c345b9929b5b3f725eee7c0e
 	b2sums = fefa71e6cbf9bce2f09293d9eb1d7018d041dca7e3feec7eb4d2e077b142f459800749925f68b8a259326d7b41226e688efa6df1957a170fd1c16165d44b9bca
-	b2sums = 72399e3a7fb5499bc8448fd61109d039faf7efe1364882579916e5839e677705c592b0f394a463aa2b900ef7cd58a154fe12136e52156eeb458dc7e10c0d2be0
+	b2sums = db3bc9fc702cd693a25f0f95554de3603bbac2442c19c1e73194cef53b7fac6f222a99f208bd31bd8add5b4ec999e8d2cddf5c57baf896c6c3ee7fa2e12f487e
 	b2sums = 19c51a8fff8cda94117fd64db54d23105a9e1850db1016f391230118edc0c6430bbbc0b0e5a74a60b7c572ab4f7b59b21de8d6a77391267e63a42e17aab7e59a
 	b2sums = afef46bb3cefe57f95f6fa321d3686e15a95848298a1839f4932910f93ad4eb6542da118d9cb115df20b59e2c02b9ec80d3ddbba01c839c2ce68e4ee66d8eedb
 
 pkgname = java-mango
-
diff --git a/PKGBUILD b/PKGBUILD
index 7c23db8ae3c1..efbd6038b889 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,17 @@
 # Notes: http://ric.uthscsa.edu/mango/mango.html
 # User guide: http://ric.uthscsa.edu/mango/userguide.html
 
+### Info ###
 pkgname=java-mango
-_pkgname=${pkgname/java-/}
+_pkgname=${pkgname#java-}
 pkgver=4.1
-pkgrel=3
+pkgrel=4
 pkgdesc='A viewer for medical research images'
-arch=('any') # x86_64
+arch=('any')
 url='http://ric.uthscsa.edu/mango/index.html'
 license=('custom:RII-UTHSCSA')
-depends=('jre7-openjdk')
+depends=('hicolor-icon-theme' 'jre7-openjdk')
+makedepends=('imagemagick')
 options=(!strip)
 source=(
     "${pkgname}-${pkgver}.zip::http://ric.uthscsa.edu/$_pkgname/downloads/${_pkgname}_unix.zip"
@@ -20,24 +22,29 @@ source=(
     "${_pkgname}.png::http://ric.uthscsa.edu/$_pkgname/images/app_icon.png"
     'LICENSE'
 )
-b2sums=(
-    '34ed9385f51cc29560a333abd0509bf2a41ef3db73d5b56d73df9ac8a446575f65f403b62daa8e9d589b9fe1dd720dac66fb56e6c345b9929b5b3f725eee7c0e'
-    'fefa71e6cbf9bce2f09293d9eb1d7018d041dca7e3feec7eb4d2e077b142f459800749925f68b8a259326d7b41226e688efa6df1957a170fd1c16165d44b9bca'
-    '72399e3a7fb5499bc8448fd61109d039faf7efe1364882579916e5839e677705c592b0f394a463aa2b900ef7cd58a154fe12136e52156eeb458dc7e10c0d2be0'
-    '19c51a8fff8cda94117fd64db54d23105a9e1850db1016f391230118edc0c6430bbbc0b0e5a74a60b7c572ab4f7b59b21de8d6a77391267e63a42e17aab7e59a'
-    'afef46bb3cefe57f95f6fa321d3686e15a95848298a1839f4932910f93ad4eb6542da118d9cb115df20b59e2c02b9ec80d3ddbba01c839c2ce68e4ee66d8eedb'
-)
+b2sums=('34ed9385f51cc29560a333abd0509bf2a41ef3db73d5b56d73df9ac8a446575f65f403b62daa8e9d589b9fe1dd720dac66fb56e6c345b9929b5b3f725eee7c0e'
+        'fefa71e6cbf9bce2f09293d9eb1d7018d041dca7e3feec7eb4d2e077b142f459800749925f68b8a259326d7b41226e688efa6df1957a170fd1c16165d44b9bca'
+        'db3bc9fc702cd693a25f0f95554de3603bbac2442c19c1e73194cef53b7fac6f222a99f208bd31bd8add5b4ec999e8d2cddf5c57baf896c6c3ee7fa2e12f487e'
+        '19c51a8fff8cda94117fd64db54d23105a9e1850db1016f391230118edc0c6430bbbc0b0e5a74a60b7c572ab4f7b59b21de8d6a77391267e63a42e17aab7e59a'
+        'afef46bb3cefe57f95f6fa321d3686e15a95848298a1839f4932910f93ad4eb6542da118d9cb115df20b59e2c02b9ec80d3ddbba01c839c2ce68e4ee66d8eedb')
 
-### Prepare() ###
+### Prepare ###
 prepare() {
     ## Rename Directory ##
     mv "$srcdir"/Mango "$srcdir"/$_pkgname
 
     ## Remove Unnecessary Directories/Files ##
-    rm -rf $_pkgname/{.DS_Store,jre7,$_pkgname,README}
+    rm -rf "$srcdir"/$_pkgname/{.DS_Store,jre7,$_pkgname,README}
+
+    ## Convert Icons ##
+    for res in 16 22 24 32 48 64 128 256; do
+        convert "$srcdir"/$_pkgname.png \
+            -resize ${res}x${res} \
+            "$srcdir"/$_pkgname/$_pkgname-${res}x${res}.png
+    done
 }
 
-### Package() ###
+### Package ###
 package() {
     ## Move Core Contents to /opt/mango/ ##
     install -dm0755 "$pkgdir"/opt/$_pkgname
@@ -45,17 +52,31 @@ package() {
 
     ## Move Additional Files to /opt/mango/ ##
     install -m0755 "$srcdir"/${_pkgname}.sh -t "$pkgdir"/opt/$_pkgname
-    install -m0644 "$srcdir"/{${_pkgname}.png,${_pkgname}.desktop,LICENSE} -t "$pkgdir"/opt/$_pkgname
+    install -m0644 "$srcdir"/{${_pkgname}.desktop,LICENSE} -t "$pkgdir"/opt/$_pkgname
 
     ## Symlink Desktop File ##
     install -dm0755 "$pkgdir"/usr/share/applications
-    ln -fs /opt/$_pkgname/${_pkgname}.desktop "$pkgdir"/usr/share/applications/${_pkgname}.desktop
+    ln -fs \
+        /opt/$_pkgname/${_pkgname}.desktop \
+        "$pkgdir"/usr/share/applications/${_pkgname}.desktop
 
     ## Symlink Executable to System PATH ##
     install -dm0755 "$pkgdir"/usr/bin
-    ln -fs /opt/$_pkgname/${_pkgname}.sh "$pkgdir"/usr/bin/$_pkgname
+    ln -fs \
+        /opt/$_pkgname/${_pkgname}.sh \
+        "$pkgdir"/usr/bin/$_pkgname
+
+    ## Symlink Icons ##
+    for res in 16 22 24 32 48 64 128 256; do
+        install -dm0755 "$pkgdir"/usr/share/icons/hicolor/${res}x${res}/apps
+        ln -fs \
+            /opt/$_pkgname/$_pkgname-${res}x${res}.png \
+            "$pkgdir"/usr/share/icons/hicolor/${res}x${res}/apps/$_pkgname.png
+    done
 
     ## Symlink License ##
     install -dm0755 "$pkgdir"/usr/share/licenses/$_pkgname
-    ln -fs /opt/$_pkgname/LICENSE "$pkgdir"/usr/share/licenses/$_pkgname/LICENSE
+    ln -fs \
+        /opt/$_pkgname/LICENSE \
+        "$pkgdir"/usr/share/licenses/$_pkgname/LICENSE
 }
diff --git a/mango.desktop b/mango.desktop
index e36b54385fb8..069e61774276 100644
--- a/mango.desktop
+++ b/mango.desktop
@@ -4,9 +4,9 @@ Type=Application
 Name=Mango
 GenericName=Medical research image viewer
 Comment=Multi-image analysis GUI
-Exec=mango %F
+Exec=/usr/bin/mango %F
 TryExec=/opt/mango/mango.sh
-Icon=/opt/mango/icon.png
+Icon=mango
 Categories=Java;Utility
 Terminal=false
 Keywords=MRI,GUI,image