11 files changed, 110 insertions, 28 deletions
diff --git a/misc/jmri/DecoderPro.desktop b/misc/jmri/DecoderPro.desktop
new file mode 100644
index 000000000000..e837b1f45575
--- /dev/null
+++ b/misc/jmri/DecoderPro.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=Decoder Pro
+Comment=Java Model Railroad Interface
+Icon=jmri
+Exec=DecoderPro
+TryExec=/usr/bin/DecoderPro
+Terminal=false
+StartupNotify=false
+Type=Application
+Categories=Other;Java
diff --git a/misc/jmri/DispatcherPro.desktop b/misc/jmri/DispatcherPro.desktop
new file mode 100644
index 000000000000..6a3ea9a072f0
--- /dev/null
+++ b/misc/jmri/DispatcherPro.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=Dispatcher Pro
+Comment=Java Model Railroad Interface
+Icon=jmri
+Exec=DispatcherPro
+TryExec=/usr/bin/DispatcherPro
+Terminal=false
+StartupNotify=false
+Type=Application
+Categories=Other;Java
diff --git a/misc/jmri/PanelPro.desktop b/misc/jmri/PanelPro.desktop
new file mode 100644
index 000000000000..62915a5c1f86
--- /dev/null
+++ b/misc/jmri/PanelPro.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=Panel Pro
+Comment=Java Model Railroad Interface
+Icon=jmri
+Exec=PanelPro
+TryExec=/usr/bin/PanelPro
+Terminal=false
+StartupNotify=false
+Type=Application
+Categories=Other;Java
diff --git a/misc/jmri/README b/misc/jmri/README
index fbda685a895a..376f712116c7 100644
--- a/misc/jmri/README
+++ b/misc/jmri/README
@@ -1,7 +1,5 @@
-JMRI is the Java Model Railroad Interface, a set of tools for model railroad
-computer control. 
-
-This requires javacomm and rxtx.
+JMRI is the Java Model Railroad Interface, a set of tools for model
+railroad computer control. 
 
 Please note, to access your controller hardware you will probably need to
-add your username to the 'uucp' group ('dialout' on 13.0+).
+add your username to the 'dialout' group.
diff --git a/misc/jmri/SignalPro.desktop b/misc/jmri/SignalPro.desktop
new file mode 100644
index 000000000000..c6c4cc2403b3
--- /dev/null
+++ b/misc/jmri/SignalPro.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=Signal Pro
+Comment=Java Model Railroad Interface
+Icon=jmri
+Exec=SignalPro
+TryExec=/usr/bin/SignalPro
+Terminal=false
+StartupNotify=false
+Type=Application
+Categories=Other;Java
diff --git a/misc/jmri/SoundPro.desktop b/misc/jmri/SoundPro.desktop
new file mode 100644
index 000000000000..8078d8660919
--- /dev/null
+++ b/misc/jmri/SoundPro.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=Sound Pro
+Comment=Java Model Railroad Interface
+Icon=jmri
+Exec=SoundPro
+TryExec=/usr/bin/SoundPro
+Terminal=false
+StartupNotify=false
+Type=Application
+Categories=Other;Java
diff --git a/misc/jmri/doinst.sh b/misc/jmri/doinst.sh
index c65169c7082a..50a085e0598a 100644
--- a/misc/jmri/doinst.sh
+++ b/misc/jmri/doinst.sh
@@ -4,3 +4,6 @@ else
   rm -f var/log/jmri/messages.log.new
 fi
 
+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/misc/jmri/jmri.SlackBuild b/misc/jmri/jmri.SlackBuild
index 785db9007b10..d48e7f14fefe 100644
--- a/misc/jmri/jmri.SlackBuild
+++ b/misc/jmri/jmri.SlackBuild
@@ -1,26 +1,38 @@
 #!/bin/sh
 
 # Slackware build script for JMRI
-# Written by David Spencer <nobbutl@yahoo.co.uk>
-# This script is dedicated to the public domain
+
+# Copyright 2011 David Spencer, Baildon, West Yorkshire, U.K.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jmri
-VERSION=2.4A
+VERSION=${VERSION:-2.14}
+REVISION=${REVISION:-r19563}
+
+ARCH=i486   # some embedded libraries are 32 bit only, see lib/linux/*
+
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 TARNAM=JMRI
 
-# 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
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -32,7 +44,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $TARNAM
-tar xvf $CWD/$TARNAM.$VERSION.tgz
+tar xvf $CWD/$TARNAM.$VERSION-$REVISION.tgz
 cd $TARNAM
 chown -R root:root .
 find . \
@@ -43,7 +55,8 @@ find . \
 
 mkdir -p $PKG/usr/bin
 cp -a \
-  DecoderPro InstallTest JmriDemo LocoTools PanelPro cornwall \
+  DecoderPro DispatcherPro PanelPro SignalPro SoundPro \
+  InstallTest JmriDemo LocoTools cornwall \
   $PKG/usr/bin
 chmod 755 $PKG/usr/bin/*
 
@@ -79,6 +92,18 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+mkdir -p $PKG/usr/share/applications
+install -m 0644 -t $PKG/usr/share/applications \
+  $CWD/DecoderPro.desktop \
+  $CWD/DispatcherPro.desktop \
+  $CWD/PanelPro.desktop \
+  $CWD/SignalPro.desktop \
+  $CWD/SoundPro.desktop
+
+mkdir -p $PKG/usr/share/pixmaps
+install -m 0644 -t $PKG/usr/share/pixmaps \
+  $CWD/jmri.png
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
diff --git a/misc/jmri/jmri.info b/misc/jmri/jmri.info
index ab9527314ca6..f46c069be5a4 100644
--- a/misc/jmri/jmri.info
+++ b/misc/jmri/jmri.info
@@ -1,10 +1,10 @@
 PRGNAM="jmri"
-VERSION="2.4A"
+VERSION="2.14"
 HOMEPAGE="http://jmri.org/"
-DOWNLOAD="http://downloads.sourceforge.net/jmri/JMRI.2.4A.tgz"
-MD5SUM="b1c220ccecea3e0050ff9a76c0deda53"
-DOWNLOAD_x86_64=""
+DOWNLOAD="http://downloads.sourceforge.net/jmri/JMRI.2.14-r19563.tgz"
+MD5SUM="60c3f3c3682118b66de8b3f4125af949"
+DOWNLOAD_x86_64="UNSUPPORTED"
 MD5SUM_x86_64=""
 MAINTAINER="David Spencer"
-EMAIL="nobbutl@yahoo.co.uk"
-APPROVED="rworkman"
+EMAIL="baildon.research@googlemail.com"
+APPROVED="Niels Horn"
diff --git a/misc/jmri/jmri.png b/misc/jmri/jmri.png
new file mode 100644
index 000000000000..ccf58371c7c2
--- /dev/null
+++ b/misc/jmri/jmri.png
diff --git a/misc/jmri/slack-desc b/misc/jmri/slack-desc
index 603b7b084b61..a2f5692db19d 100644
--- a/misc/jmri/slack-desc
+++ b/misc/jmri/slack-desc
@@ -7,12 +7,13 @@
 
     |-----handy-ruler------------------------------------------------------|
 jmri: jmri (Java Model Railroad Interface)
-jmri: 
+jmri:
 jmri: A set of tools for model railroad computer control.
-jmri: 
+jmri:
 jmri: Homepage: http://jmri.org/
 jmri:
 jmri:
 jmri:
 jmri:
 jmri:
+jmri: