3 files changed, 21 insertions, 33 deletions
diff --git a/games/armagetronad/armagetronad.SlackBuild b/games/armagetronad/armagetronad.SlackBuild
index 2ad2a6dc2c..e32cd1cf7b 100644
--- a/games/armagetronad/armagetronad.SlackBuild
+++ b/games/armagetronad/armagetronad.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2010-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2010-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # based on the hollywoodb's one on 12.2 repository
 # All rights reserved.
 #
@@ -22,7 +22,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=armagetronad
-VERSION=${VERSION:-0.2.9.0.1}
+VERSION=${VERSION:-0.2.9.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -108,31 +108,29 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 rm -rf $PKG/etc/rc.d
 
-# don't overwrite old configs
-CONFIGS="aiplayers.cfg \
-  default.cfg \
-  settings.cfg \
-  settings_authentication.cfg \
-  settings_dedicated.cfg \
-  settings_visual.cfg"
-for config in $CONFIGS ;
-do
-  mv $PKG/etc/$PRGNAM/$config $PKG/etc/$PRGNAM/$config.new ;
-done
-
-# fix .desktop file
+# fix .desktop file and icons
 mkdir $PKG/usr/share/applications
-mv $PKG/usr/share/games/$PRGNAM/desktop/$PRGNAM.desktop $PKG/usr/share/applications
-install -D -m 0644 $PKG/usr/share/games/armagetronad/desktop/icons/large/armagetronad.png \
-  $PKG/usr/share/pixmaps/armagetronad.png
+install -D -m 0644 desktop/$PRGNAM.desktop \
+  $PKG/usr/share/applications/$PRGNAM.desktop
+install -D -m 0644 desktop/icons/48x48/$PRGNAM.png \
+  $PKG/usr/share/pixmaps/$PRGNAM.png
+for i in 16 32 48 ; do
+  install -D -m 0644 desktop/icons/${i}x${i}/$PRGNAM.png \
+    $PKG/usr/share/icons/hicolor/${i}x${i}/apps/
+done
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
+# don't overwrite old configs
+for config in aiplayers default settings settings_authentication settings_dedicated settings_visual ; do
+  mv $PKG/etc/$PRGNAM/$config.cfg $PKG/etc/$PRGNAM/$config.cfg.new
+  echo "config etc/$PRGNAM/$config.cfg.new" >> $PKG/install/doinst.sh
+done
 
 cd $PKG
 /sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/armagetronad/armagetronad.info b/games/armagetronad/armagetronad.info
index ad5ac82483..5dc8bee167 100644
--- a/games/armagetronad/armagetronad.info
+++ b/games/armagetronad/armagetronad.info
@@ -1,10 +1,10 @@
 PRGNAM="armagetronad"
-VERSION="0.2.9.0.1"
+VERSION="0.2.9.1.0"
 HOMEPAGE="http://www.armagetronad.org"
-DOWNLOAD="https://gitlab.com/armagetronad/armagetronad/-/archive/v0.2.9.0.1/armagetronad-v0.2.9.0.1.tar.bz2"
-MD5SUM="beeb72db9409fac3d9d4175a43a22a7f"
+DOWNLOAD="https://gitlab.com/armagetronad/armagetronad/-/archive/v0.2.9.1.0/armagetronad-v0.2.9.1.0.tar.bz2"
+MD5SUM="0c55c7ec2996daa2e834342d631e434d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ftgl protobuf"
+REQUIRES="ftgl protobuf3"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/games/armagetronad/doinst.sh b/games/armagetronad/doinst.sh
index ad4ad7c914..c21aa1ca2c 100644
--- a/games/armagetronad/doinst.sh
+++ b/games/armagetronad/doinst.sh
@@ -15,13 +15,3 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
-CONFIGS="aiplayers.cfg \
-  default.cfg \
-  settings.cfg \
-  settings_authentication.cfg \
-  settings_dedicated.cfg \
-  settings_visual.cfg"
-for config in $CONFIGS ;
-do
-	config etc/armagetronad/$config.new ;
-done