5 files changed, 31 insertions, 9 deletions
diff --git a/development/alloy/README b/development/alloy/README
index 180468fc39057..6d1e763ac2719 100644
--- a/development/alloy/README
+++ b/development/alloy/README
@@ -1,4 +1,3 @@
-Alloy is a lightweight modelling language for software design. It is
-amenable to a fully automatic analysis, using the Alloy Analyzer, and
-provides a visualizer for making sense of solutions and counterexamples it
-finds.
+Alloy is a lightweight modelling language for software design. It is amenable
+to a fully automatic analysis, using the Alloy Analyzer, and provides a
+visualizer for making sense of solutions and counterexamples it finds.
diff --git a/development/alloy/alloy.SlackBuild b/development/alloy/alloy.SlackBuild
index 10d36014e08c6..4b7c5c547b7f4 100644
--- a/development/alloy/alloy.SlackBuild
+++ b/development/alloy/alloy.SlackBuild
@@ -33,19 +33,32 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 
+# check the jarball's version matches VERSION (doesn't matter the dots
+# in VERSION are treated as meta-character by grep)
+if ! unzip -c $CWD/$DIST.jar edu/mit/csail/sdg/alloy4/Version.java \
+       | grep 'String version()' | grep --quiet $VERSION; then
+  printf "%s is not of version %s.\n" $DIST.jar $VERSION 1>&2
+  exit 1
+fi
+
 mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
 install -Dm 644 $CWD/$DIST.jar $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/$DIST.jar
 
 mkdir -p $PKG/usr/bin
 ( cd $PKG/usr/bin
-  cat > $DIST <<__END__
+  cat > $PRGNAM <<__END__
 #!/bin/sh
-java -jar /usr/lib$LIBDIRSUFFIX/$PRGNAM/$DIST.jar "\$@"
+exec java -jar /usr/lib$LIBDIRSUFFIX/$PRGNAM/$DIST.jar "\$@"
 __END__
-  chmod 755 $DIST
-  ln -sf $DIST $PRGNAM
+  chmod 0755 $PRGNAM
 )
 
+mkdir -p $PKG/usr/share/pixmaps
+cat $CWD/alloy.png > $PKG/usr/share/pixmaps/alloy.png
+
+mkdir -p $PKG/usr/share/applications
+cat $CWD/alloy.desktop > $PKG/usr/share/applications/alloy.desktop
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/alloy/alloy.desktop b/development/alloy/alloy.desktop
new file mode 100644
index 0000000000000..cf2043a64eb37
--- /dev/null
+++ b/development/alloy/alloy.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Alloy Analyzer
+Comment=Alloy modeling language and analyzer
+Exec=alloy
+Icon=alloy.png
+Terminal=false
+Categories=Development;
+StartupNotify=true
diff --git a/development/alloy/alloy.info b/development/alloy/alloy.info
index ca395920567b8..0e4b66f30d738 100644
--- a/development/alloy/alloy.info
+++ b/development/alloy/alloy.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Jockey S. Kyd"
 EMAIL="jockey.kyd@gmail.com"
-APPROVED="Niels Horn"
+APPROVED="Erik Hanson"
diff --git a/development/alloy/alloy.png b/development/alloy/alloy.png
new file mode 100644
index 0000000000000..8d01c72da2351
--- /dev/null
+++ b/development/alloy/alloy.png