6 files changed, 185 insertions, 21 deletions
diff --git a/games/uqm/README b/games/uqm/README
index c83458e6dc1d..3717c399ead4 100644
--- a/games/uqm/README
+++ b/games/uqm/README
@@ -3,8 +3,3 @@ Control II". It runs on modern operating systems and is 100% free.
 
 You may also want the optional uqm_voice and uqm_3domusic packages, for
 a more festive gaming experience.
-
-Note: The version number for the binary is 0.6.2. The version number for
-and for the content, voice, and 3domusic packages is 0.6.0.
-This is correct.
-
diff --git a/games/uqm/doinst.sh b/games/uqm/doinst.sh
new file mode 100644
index 000000000000..5fb28930db0b
--- /dev/null
+++ b/games/uqm/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/games/uqm/uqm.SlackBuild b/games/uqm/uqm.SlackBuild
index 80a192bddaa6..d167846b1646 100644
--- a/games/uqm/uqm.SlackBuild
+++ b/games/uqm/uqm.SlackBuild
@@ -1,23 +1,21 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for uqm
 
 # Written by B. Watson (yalhcru@gmail.com)
 
 PRGNAM=uqm
-VERSION=${VERSION:-0.6.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.7.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CONTENT=${PRGNAM}_content
-CONTVER=${CONTVER:-0.6.0}
+CONTVER=${CONTVER:-0.7.0}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -70,7 +68,8 @@ build_config() {
    echo 2     # 1 = Don't include, 2 = Include OpenGL graphics support
    echo 4     # Top-level menu option 4: Tracker music support
    echo 1     # 1 = included libmikmod, 2 = system libmikmod
-   echo 10    # Top-level menu option 10: Installation paths...
+   echo 11    # Top-level menu option 11: Installation paths...
+              # (N.B. option 11 was option 10 in uqm 0.6.2)
    echo 1     # Option 1 = Installation prefix
    echo /usr  # New value:
    echo 3     # Option 3 = Location for non-sharable data
@@ -88,9 +87,8 @@ if [ ! -e $CWD/$PRGNAM-$CONTVER-content.uqm ]; then
 fi
 
 
-cd sc2
 build_config | sh build.sh uqm config
-sed -i.bak "s/-O3/$SLKCFLAGS/" build.vars
+sed -i "s/-O3/$SLKCFLAGS/" build.vars
 sh build.sh uqm
 
 strip $PRGNAM
@@ -101,15 +99,23 @@ mkdir -p $PKG/usr/bin
 cat $PRGNAM-wrapper > $PKG/usr/bin/$PRGNAM
 chmod 0755 $PKG/usr/bin/$PRGNAM
 
-mkdir -p $PKG/usr/share/$PRGNAM/content/packages/addons
+mkdir -p $PKG/usr/share/$PRGNAM/content/{addons,packages}
 cp content/version $PKG/usr/share/$PRGNAM/content
+
 # Install the uqm content. Without this the binary is not useful.
 cat $CWD/$PRGNAM-$CONTVER-content.uqm > \
     $PKG/usr/share/$PRGNAM/content/packages/$PRGNAM-$CONTVER-content.uqm
 
+# Man page created for SBo (it's basically the README + roff markup)
 mkdir -p $PKG/usr/man/man1
 gzip -9c $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
+# .desktop and icon borrowed from Debian
+mkdir -p $PKG/usr/share/applications
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+mkdir -p $PKG/usr/share/pixmaps
+cat $CWD/$PRGNAM.xpm > $PKG/usr/share/pixmaps/$PRGNAM.xpm
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp $PRGNAM.lsm AUTHORS BUGS COPYING ChangeLog Contributing README WhatsNew \
    doc/users/manual.txt $PKG/usr/doc/$PRGNAM-$VERSION
@@ -117,6 +123,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/uqm/uqm.desktop b/games/uqm/uqm.desktop
new file mode 100644
index 000000000000..8fdd54b012f7
--- /dev/null
+++ b/games/uqm/uqm.desktop
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Version=1.0
+Name=The Ur-Quan Masters
+Name[de]=Der Ur-Quan Dominanz
+Name[en]=The Ur-Quan Masters
+Name[es]=Los Amos Ur-Quan
+Name[fi]=Ur-Quan Mastersiin
+Name[fr]=Les Seigneurs Ur-Quan
+Name[it]=I Dominatori Ur-Quan
+Name[ru]=Ур-Кванские Хозяева
+Comment=An interstellar adventure game
+Comment[de]=Ein interstellar Abenteuerspiel
+Comment[en]=An interstellar adventure game
+Comment[es]=Una aventura interestelar
+Comment[fr]=Une aventure interstellaire
+Exec=uqm
+Icon=uqm
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Game;ArcadeGame;
diff --git a/games/uqm/uqm.info b/games/uqm/uqm.info
index b4b6b33197ee..8e84fd8c5d13 100644
--- a/games/uqm/uqm.info
+++ b/games/uqm/uqm.info
@@ -1,12 +1,12 @@
 PRGNAM="uqm"
-VERSION="0.6.2"
+VERSION="0.7.0"
 HOMEPAGE="http://sc2.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/sc2/uqm-0.6.2-source.tgz \
-  http://downloads.sourceforge.net/sc2/uqm-0.6.0-content.uqm"
-MD5SUM="ba4ee595b62349873d510b9827e7648d \
-  7e8f0ed8490e24231431420ea2ba6a03"
+DOWNLOAD="http://downloads.sourceforge.net/sc2/uqm-0.7.0-source.tgz \
+  http://downloads.sourceforge.net/sc2/uqm-0.7.0-content.uqm"
+MD5SUM="f9018ea0493d7dac6a9e1006b00af7df \
+  2f36dcb15274dbbcb5e266f2ed84d5b2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
-APPROVED="dsomero"
+APPROVED="Niels Horn"
diff --git a/games/uqm/uqm.xpm b/games/uqm/uqm.xpm
new file mode 100644
index 000000000000..fb472c6347bc
--- /dev/null
+++ b/games/uqm/uqm.xpm
@@ -0,0 +1,138 @@
+/* XPM */
+static char *ur-quan-icon-std-3[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 100 2",
+"   c black",
+".  c #0D350C",
+"X  c #0B390B",
+"o  c #142F12",
+"O  c #1E2713",
+"+  c #2F1D16",
+"@  c #3E1B0F",
+"#  c #3D1A10",
+"$  c #2B251D",
+"%  c #342111",
+"&  c #2C2D24",
+"*  c #2F3026",
+"=  c #32342B",
+"-  c #373732",
+";  c #3B3D39",
+":  c #064A06",
+">  c #044E04",
+",  c #084108",
+"<  c #035802",
+"1  c #036202",
+"2  c #036D02",
+"3  c #027802",
+"4  c #3D413C",
+"5  c #3E433E",
+"6  c #414540",
+"7  c #434843",
+"8  c #484D47",
+"9  c #4F544E",
+"0  c #595C55",
+"q  c #605C5A",
+"w  c #695A5E",
+"e  c #7F5567",
+"r  c #038303",
+"t  c #018A01",
+"y  c #029100",
+"u  c #019800",
+"i  c #009B00",
+"p  c #009E00",
+"a  c #00A200",
+"s  c #00A800",
+"d  c #00AE00",
+"f  c #01B200",
+"g  c #01B700",
+"h  c #01BB00",
+"j  c #00BE00",
+"k  c #33B70D",
+"l  c #00C300",
+"z  c #00C600",
+"x  c #01C701",
+"c  c #00CA00",
+"v  c #00D000",
+"b  c #00D400",
+"n  c #00D800",
+"m  c #00DE00",
+"M  c #1FCB10",
+"N  c #18D40F",
+"B  c #00E100",
+"V  c #00E500",
+"C  c #00EC00",
+"Z  c #0EE30B",
+"A  c #01F101",
+"S  c #03F102",
+"D  c #01F401",
+"F  c #29C010",
+"G  c #40B110",
+"H  c #4FB114",
+"J  c #5CAA0D",
+"K  c #5AAE13",
+"L  c #61A90D",
+"P  c #CB4002",
+"I  c #CE4102",
+"U  c #CC4902",
+"Y  c #DA4703",
+"T  c #DC4C03",
+"R  c #DC4F04",
+"E  c #DE5306",
+"W  c #DE6D02",
+"Q  c #E15C0A",
+"!  c #E47D01",
+"~  c #E6793C",
+"^  c #A5BA7F",
+"/  c #B8E332",
+"(  c #BDE438",
+")  c #EC9101",
+"_  c #EC9C01",
+"`  c #E7A601",
+"'  c #EBB601",
+"]  c #ECBC02",
+"[  c #CFD41A",
+"{  c #DFC809",
+"}  c #C7E742",
+"|  c #D4E84C",
+" . c #D7E755",
+".. c #D5E55B",
+"X. c #9BAC93",
+"o. c #99AB98",
+"O. c #9EB589",
+"+. c #D1D0D5",
+"@. c #D3D1D7",
+"#. c None",
+/* pixels */
+"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.",
+"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.",
+"#.#.#.#.#.#.#.#.#.#.#.# + #.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.",
+"#.#.#.#.#.#.#.#.#.; * Q Y = #.#.o > < < < < < > < % = #.#.#.#.#.",
+"#.#.#.#.#.#.#.#.6 = 9 ~ ' Y + X u a L L L L L d d U P 6 #.#.#.#.",
+"#.#.#.#.#.#.#.5 . 2 q o.O.Q % , y p J ) ) ` { [ h a L P #.#.#.#.",
+"#.#.#.#.#.#.& : 2 p M O.@.w = . 2 p a d d d K  .} F x W @ 5 #.#.",
+"#.#.#.#.#.o > 3 u c V l 5 4 #.o 1 u d v c c x ( ..| N j y o #.#.",
+"#.#.#.#.* > 3 u l B h > - #.#.o 2 p s b n n n c ( ..| M p o #.#.",
+"#.#.#.- , r p c n s : 5 #.#.5 : u p d b v c v b c /  ./ u O #.#.",
+"#.#.#.o 3 f n N 8 o 6 #.#.7 3 a p a j n v x x l c x K ( p O #.#.",
+"#.#.5 < a n N w q ; & #.#.> a u a h b m c l x j c l H ( a O #.#.",
+"#.#.& t v n t w w 9 & $ > u p s j v n x j j x l c x H ( a O #.#.",
+"#.#.1 n n 3 O $ 5 0 5 y a p d c v c j h x b V C C C Z / p O #.#.",
+"#.#.2 m y $ #.#.* 5 y k p d c b k M x l b V D D D D D D y $ #.#.",
+"#.#.< r O #.#.#.= 3 a 9 0 k k H X.M c b C D V u y g j s , 8 #.#.",
+"#.#.o = #.#.#.& t a a j J ) ) J x c n A D A > O $ O . $ #.#.#.#.",
+"#.#.#.#.#.#.& < u a f x J _ _ ) x v C D C > 7 #.#.- @ % #.#.#.#.",
+"#.#.#.X 1 > < < t f c x J ) ) J b C D V , 7 #.#.; # Y P $ #.#.#.",
+"#.#.#.# J d s p y h m X.H k k H O.Z d o #.#.#.& & 0 e _ P # #.#.",
+"#.#.#.# U G a h x y v M x v B D k N 4 $ #.#.= > 3 8 X.O.Y @ #.#.",
+"#.#.#.O P ] F c c d t v m n D D Z q q 5 $ & X 3 p l O.+.; ; #.#.",
+"#.#.#.#.@ Y ] L x c h y h Z D t O 8 w 8 ; o 3 s v m k 5 #.#.#.#.",
+"#.#.#.#.#.@ ! ] L x b m t k r - #.- 8 0 7 2 a b B h > #.#.#.#.#.",
+"#.#.#.#.#.7 @ ) ] Z B A b . 6 #.#.#.O 9 3 p c B f : #.#.#.#.#.#.",
+"#.#.#.#.#.#.8 @ Y ` k Z N & #.#.#.& < r a c n u , #.#.#.#.#.#.#.",
+"#.#.#.#.#.#.#.#.+ P R K N * #.#.. < t h m m u O #.#.#.#.#.#.#.#.",
+"#.#.#.#.#.#.#.#.#.+ @ @ r = #.. 1 t f j d 2 o #.#.#.#.#.#.#.#.#.",
+"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.. : 1 : X * = #.#.#.#.#.#.#.#.#.#.",
+"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.",
+"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.",
+"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#."
+};