Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/virtualbox/PKGBUILD
	extra/live-media/PKGBUILD

3 files changed, 19 insertions, 19 deletions

diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD
index d22d93518..16a9cf725 100644
--- a/community/stone-soup/PKGBUILD
+++ b/community/stone-soup/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=stone-soup
 pkgver=0.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An open-source, single-player, role-playing roguelike game of exploration and treasure-hunting"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://crawl.develz.org/'
@@ -14,13 +14,14 @@ install=('stone-soup.install')
 source=("http://downloads.sourceforge.net/sourceforge/crawl-ref/stone_soup-${pkgver}-nodeps.tar.bz2"
         "${pkgname}.desktop")
 md5sums=('3f73fb051215df3633a554d81e67a452'
-         '98be780cddb2a0915bbab15ad93644f1')
+         'afdacb4c39342e75674efb88eeb3da21')
 
 build() {
 
     cd "${srcdir}/stone_soup-${pkgver}/source"
 
-    # adjust makefile to use /usr/bin, owner root:root, disable setgid on executable
+    # adjust makefile to use /usr/bin, owner root:root,
+    # disable setgid on executable
 
     sed -i 's|bin_prefix    := bin|bin_prefix    := usr/bin|' makefile
     sed -i 's/INSTALL_UGRP := games:games/INSTALL_UGRP := root:root/' makefile
@@ -29,7 +30,7 @@ build() {
     # first build and install tiles version
 
     make DESTDIR="${pkgdir}" \
-         SAVEDIR="~/.stone-soup/" \
+         SAVEDIR="~/.crawl/" \
          DATADIR="/usr/share/${pkgname}/data" \
          USE_UNICODE=y \
          TILES=y \
@@ -42,19 +43,22 @@ build() {
     # then build and install console version
 
     make DESTDIR="${pkgdir}" \
-         SAVEDIR="~/.stone-soup/" \
+         SAVEDIR="~/.crawl/" \
          DATADIR="/usr/share/${pkgname}/data" \
          USE_UNICODE=y \
          install
 
     # install crawl license
 
-    install -D -m644 ../licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
+    install -D -m644 ../licence.txt \
+        "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
 
     # install icon and .desktop file
 
-    install -D -m644 dat/tiles/stone_soup_icon-32x32.png "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-    install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+    install -D -m644 dat/tiles/stone_soup_icon-32x32.png \
+        "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    install -D -m644 "${srcdir}/${pkgname}.desktop" \
+        "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 
 }
 
diff --git a/community/stone-soup/stone-soup.desktop b/community/stone-soup/stone-soup.desktop
index f87d084c8..f76343515 100644
--- a/community/stone-soup/stone-soup.desktop
+++ b/community/stone-soup/stone-soup.desktop
@@ -1,11 +1,8 @@
-#!/usr/bin/env xdg-open
 [Desktop Entry]
-Version=1.0
 Type=Application
-Name=Stone Soup
-GenericName=Crawl Stone Soup
+Name=Dungeon Crawl Stone Soup 
 Comment=An open-source, single-player, role-playing roguelike game of exploration and treasure-hunting
 Icon=stone-soup.png
 Exec=/usr/bin/crawl-tiles
-Categories=Game;ArcadeGame
+Categories=Game;AdventureGame
 
diff --git a/community/stone-soup/stone-soup.install b/community/stone-soup/stone-soup.install
index 08cb7e01d..2320123e2 100644
--- a/community/stone-soup/stone-soup.install
+++ b/community/stone-soup/stone-soup.install
@@ -1,12 +1,11 @@
 post_upgrade() {
 
-    [[ $(vercmp $2 0.7.1) -ge 0 ]] && return
+    # return if old pkgver >= 0.9.0-2
+    [[ $(vercmp $2 0.9.0-2) -ge 0 ]] && return
 
     echo "---------------------------------------------------------------------
-    stone-soup saves have moved to ~/.stone-soup.
-    if you want to keep your old saves, move /var/games/stone-soup to
-    ~/.stone-soup with your user as owner.
-
-    stone-soup now also includes the tiles version (crawl-tiles)
+    stone-soup saves have moved to ~/.crawl.
+    If you want to keep your old saves, move ~/.stone-soup to
+    ~/.crawl.
 ---------------------------------------------------------------------"
 }