Index: applications/editors/josm/debian/bin/josm-ng.sh
===================================================================
--- applications/editors/josm/debian/bin/josm-ng.sh	(revision 7739)
+++ applications/editors/josm/debian/bin/josm-ng.sh	(revision 7739)
@@ -0,0 +1,31 @@
+#!/bin/sh
+josm_dir="/usr/local/share/josm"
+josm_bin="$josm_dir/josm-ng.jar"
+
+if ! [ -s ~/.josm/preferences ]; then
+     echo "Installing Preferences File"
+     cp "$josm_dir/preferences"  ~/.josm/preferences
+fi
+
+if ! [ -s ~/.josm/bookmarks ]; then
+     echo "Installing Bookmarks File"
+     cp "$josm_dir/bookmarks"  ~/.josm/bookmarks
+fi
+
+# ls -l "$josm_bin"
+# unzip -p    $josm_bin REVISION | grep "Last Changed"
+
+if [ -n "$http_proxy" ]; then
+    proxy_host=${http_proxy%:*}
+    proxy_host=${proxy_host#*//}
+    proxy_port=${http_proxy##*:}
+    proxy_port=${proxy_port%/}
+    proxy=" -Dhttp.proxyHost=$proxy_host -Dhttp.proxyPort=$proxy_port "
+    echo "Proxy: $proxy"
+fi
+
+java -Djosm.resource=/usr/share/icons/map-icons/square.small \
+     -Xmx500m \
+     $proxy \
+     -jar "$josm_bin"\
+     "$@"
Index: applications/editors/josm/debian/bin/josm.sh
===================================================================
--- applications/editors/josm/debian/bin/josm.sh	(revision 7738)
+++ applications/editors/josm/debian/bin/josm.sh	(revision 7739)
@@ -25,5 +25,5 @@
 fi
 
-java -Djosm.resource=/usr/share/map-icons/square.small \
+java -Djosm.resource=/usr/share/icons/map-icons/square.small \
      -Xmx500m \
      $proxy \
Index: applications/editors/josm/debian/make_install_files.sh
===================================================================
--- applications/editors/josm/debian/make_install_files.sh	(revision 7738)
+++ applications/editors/josm/debian/make_install_files.sh	(revision 7739)
@@ -33,5 +33,5 @@
 # ------------------------------------------------------------------
 # Compile the Jar Files 
-echo "Compile Josm"
+echo "------------- Compile Josm"
 cd core
 ant -q clean
@@ -39,5 +39,5 @@
 cd ..
 
-echo "Compile Josm Plugins"
+echo "------------- Compile Josm Plugins"
 cd plugins
 ant -q clean
@@ -45,9 +45,17 @@
 cd ..
 
+# Compile the Josm-ng Files 
+echo "------------- Compile Josm-ng"
+cd ../josm-ng
+    ant -q clean
+    ant -q josm-ng-impl.jar || exit -1
+cd ../josm
+
 
 # ------------------------------------------------------------------
-# Copy Jar Files
+echo "------------- Copy Jar Files"
 
 cp ./core/dist/josm-custom.jar $jar_path/josm.jar || exit -1
+cp ../josm-ng/dist/josm-ng.jar $jar_path/josm-ng.jar || exit -1
 
 plugin_jars=`find dist -name "*.jar"`
@@ -73,4 +81,5 @@
 # ------------------------------------------------------------------
 cp "debian/bin/josm.sh" "$bin_path/josm"
+cp "debian/bin/josm-ng.sh" "$bin_path/josm-ng"
 
 sed "s/PLUGIN_LIST/$plugins/;" <debian/bin/preferences >"$jar_path/preferences"
Index: applications/editors/josm/debian/rules
===================================================================
--- applications/editors/josm/debian/rules	(revision 7738)
+++ applications/editors/josm/debian/rules	(revision 7739)
@@ -36,5 +36,5 @@
 	dh_installdirs
 
-	./debian/update_svn_revision.sh
+#	./debian/update_svn_revision.sh
 	./debian/make_install_files.sh ${destdir} || exit -1