7 files changed, 11 insertions, 72 deletions
diff --git a/misc/jmri/DecoderPro.desktop b/misc/jmri/DecoderPro.desktop
deleted file mode 100644
index e837b1f455..0000000000
--- a/misc/jmri/DecoderPro.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[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
deleted file mode 100644
index 6a3ea9a072..0000000000
--- a/misc/jmri/DispatcherPro.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[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
deleted file mode 100644
index 62915a5c1f..0000000000
--- a/misc/jmri/PanelPro.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[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/SignalPro.desktop b/misc/jmri/SignalPro.desktop
deleted file mode 100644
index c6c4cc2403..0000000000
--- a/misc/jmri/SignalPro.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[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
deleted file mode 100644
index 8078d86609..0000000000
--- a/misc/jmri/SoundPro.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[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/jmri.SlackBuild b/misc/jmri/jmri.SlackBuild
index c1e344ed00..1393cc278a 100644
--- a/misc/jmri/jmri.SlackBuild
+++ b/misc/jmri/jmri.SlackBuild
@@ -3,6 +3,8 @@
 # Slackware build script for JMRI
 
 # Copyright 2011 David Spencer, Baildon, West Yorkshire, U.K.
+# Copyright 2016 Heiko Rosemann, Germany
+
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +25,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jmri
-VERSION=${VERSION:-2.14}
-REVISION=${REVISION:-r19563}
+VERSION=${VERSION:-3.10.1}
+REVISION=${REVISION:-r28327}
 
 ARCH=i486   # some embedded libraries are 32 bit only, see lib/linux/*
 
@@ -55,8 +57,8 @@ find -L . \
 
 mkdir -p $PKG/usr/bin
 cp -a \
-  DecoderPro DispatcherPro PanelPro SignalPro SoundPro \
-  InstallTest JmriDemo LocoTools cornwall \
+  DecoderPro DecoderPro3 DispatcherPro PanelPro SignalPro SoundPro \
+  InstallTest LocoTools \
   $PKG/usr/bin
 chmod 755 $PKG/usr/bin/*
 
@@ -92,14 +94,6 @@ 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
diff --git a/misc/jmri/jmri.info b/misc/jmri/jmri.info
index e86b43184c..caf0b9a19e 100644
--- a/misc/jmri/jmri.info
+++ b/misc/jmri/jmri.info
@@ -1,10 +1,10 @@
 PRGNAM="jmri"
-VERSION="2.14"
+VERSION="3.10.1"
 HOMEPAGE="http://jmri.org/"
-DOWNLOAD="http://downloads.sourceforge.net/jmri/JMRI.2.14-r19563.tgz"
-MD5SUM="60c3f3c3682118b66de8b3f4125af949"
+DOWNLOAD="http://downloads.sourceforge.net/jmri/JMRI.3.10.1-r28327.tgz"
+MD5SUM="4b1532ed0e829f7df593686a12295efa"
 DOWNLOAD_x86_64="UNSUPPORTED"
 MD5SUM_x86_64=""
 REQUIRES="javacomm"
-MAINTAINER="David Spencer"
-EMAIL="baildon.research@googlemail.com"
+MAINTAINER="Heiko Rosemann"
+EMAIL="heiko.rosemann@web.de"