Index: /applications/editors/josm/debian/bin/josm.sh
===================================================================
--- /applications/editors/josm/debian/bin/josm.sh	(revision 5213)
+++ /applications/editors/josm/debian/bin/josm.sh	(revision 5213)
@@ -0,0 +1,33 @@
+#!/bin/sh
+josm_dir="/usr/local/share/josm"
+josm_bin="$josm_dir/josm.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/map-icons/square.small \
+     -Xmx500m \
+     $proxy \
+     -jar "$josm_bin"\
+     "$@"
+
+EOF
Index: /applications/editors/josm/debian/bin/preferences
===================================================================
--- /applications/editors/josm/debian/bin/preferences	(revision 5213)
+++ /applications/editors/josm/debian/bin/preferences	(revision 5213)
@@ -0,0 +1,20 @@
+download.gps=false
+download.newlayer=false
+download.osm=true
+download.tab=1
+lakewalker.python=/usr/bin/python
+layerlist.visible=true
+osm-server.url=http://www.openstreetmap.org/api
+plugins=PLUGIN_LIST
+projection=org.openstreetmap.josm.data.projection.Epsg4326
+propertiesdialog.visible=true
+propertiesdialog.visible=true
+propertiesdialog.visible=true
+toolbar=download;upload;|;new;open;save;exportgpx;|;undo;redo;|;preference
+validator.SpellCheck.checkKeys=true
+validator.SpellCheck.checkKeysBeforeUpload=true
+validator.SpellCheck.checkValues=true
+validator.SpellCheck.checkValuesBeforeUpload=true
+validator.SpellCheck.sources=/usr/local/share/josm/speller/words.cfg
+ywms.firefox=firefox
+ywms.port=8000
Index: /applications/editors/josm/debian/changelog
===================================================================
--- /applications/editors/josm/debian/changelog	(revision 5212)
+++ /applications/editors/josm/debian/changelog	(revision 5213)
@@ -1,3 +1,3 @@
-openstreetmap-josm (3144307) unstable; urgency=low
+openstreetmap-josm (4365205) unstable; urgency=low
 
   * Initial Version
Index: /applications/editors/josm/debian/control
===================================================================
--- /applications/editors/josm/debian/control	(revision 5212)
+++ /applications/editors/josm/debian/control	(revision 5213)
@@ -9,5 +9,5 @@
 Package: openstreetmap-josm
 Architecture: all
-Depends: sun-java6-re|sun-java6-jdk|sun-java6-jre
+Depends: sun-java6-re|sun-java6-jdk|sun-java6-jre|sun-java5-re|sun-java5-jdk|sun-java5-jre
 Recommends: openstreetmap-utils
 Suggests: openstreetmap-map-icons, openstreetmap-map-icons-restricted, openstreetmap-mapnik-data, gpsdrive, mapnik
Index: /applications/editors/josm/debian/files
===================================================================
--- /applications/editors/josm/debian/files	(revision 5212)
+++ /applications/editors/josm/debian/files	(revision 5213)
@@ -1,1 +1,1 @@
-openstreetmap-josm_3144307_all.deb utils optional
+openstreetmap-josm_4365205_all.deb utils optional
Index: /applications/editors/josm/debian/make_install_files.sh
===================================================================
--- /applications/editors/josm/debian/make_install_files.sh	(revision 5212)
+++ /applications/editors/josm/debian/make_install_files.sh	(revision 5213)
@@ -68,84 +68,10 @@
 echo "$plugins"
 
-#mkdir -p "$jar_path/speller"
-#cp ../utils/planet.osm/java/speller/words.cfg "$jar_path/speller/"
+mkdir -p "$jar_path/speller"
+cp ../utils/planet.osm/java/speller/words.cfg "$jar_path/speller/"
 
-# Maybe this has to be removed, since it is inside the plugin?
-#cp plugins/mappaint/styles/osmfeatures/elemstyles.xml "$jar_path/elemstyles.xml"
-#mkdir -p "$jar_path/plugins/mappaint/standard"
-#cp plugins/mappaint/styles/osmfeatures/elemstyles.xml "$jar_path/plugins/mappaint/standard/elemstyles.xml"
 # ------------------------------------------------------------------
-cat > "$bin_path/josm" <<EOF
-#!/bin/sh
-josm_dir="/usr/local/share/josm"
-josm_bin="\$josm_dir/josm.jar"
+cp "debian/bin/josm.sh" "$bin_path/josm"
 
-test -d ~/.josm/plugins/ || mkdir -p ~/.josm/plugins/
-#for dir in mappaint osmarender validator tways-0.1; do
-for dir in ${plugins//,/ } ; do
-    test -d ~/.josm/plugins/\$dir || mkdir -p ~/.josm/plugins/\$dir
-done
-test -d ~/.josm/plugins/mappaint/standard || mkdir -p ~/.josm/plugins/mappaint/standard
-
-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
-
-if ! [ -s ~/.josm/plugins/mappaint/standard/elemstyles.xml ]; then
-#     echo "Installing Elemstyles File"
-#     cp "\$josm_dir/elemstyles.xml"  ~/.josm/plugins/mappaint/standard/elemstyles.xml
-      true
-fi
-
-# ls -l "\$josm_bin"
-# unzip -p    \$josm_bin REVISION | grep "Last Changed"
-
-# proxy=" -Dhttp.proxyHost=gw-squid -Dhttp.proxyPort=8888 "
-
-java -Djosm.resource=/usr/share/map-icons/square.small \
-     -Xmx500m \
-     \$proxy \
-     -jar "\$josm_bin"\
-     "\$@"
-
-EOF
-
-
-cat > "$jar_path/preferences" <<EOF
-download.gps=false
-download.newlayer=false
-download.osm=true
-download.tab=1
-lakewalker.python=/usr/bin/python
-layerlist.visible=true
-osm-server.url=http://www.openstreetmap.org/api
-plugins=$plugins
-projection=org.openstreetmap.josm.data.projection.Epsg4326
-propertiesdialog.visible=true
-propertiesdialog.visible=true
-propertiesdialog.visible=true
-toolbar=download;upload;|;new;open;save;exportgpx;|;undo;redo;|;preference
-validator.SpellCheck.checkKeys=true
-validator.SpellCheck.checkKeysBeforeUpload=true
-validator.SpellCheck.checkValues=true
-validator.SpellCheck.checkValuesBeforeUpload=true
-validator.SpellCheck.sources=/usr/local/share/josm/speller/words.cfg
-ywms.firefox=firefox
-ywms.port=8000
-EOF
-
-cat > "$jar_path/bookmarks" <<EOF
-Muenchen+,47.983424415942416,11.402620097655612,48.36334800308583,12.002250823113542
-Muenchen-,48.05109190794662,11.447878885677385,48.246831966462025,11.703938333879364
-Kirchheim,48.14904045814527,11.728348604380155,48.18983784113904,11.79273346326812
-Muc_Altstadtring,48.125724515280666,11.553433712891074,48.15107325612488,11.596158188775085
-Mainz,49.58,8.14,49.6,8.16
-Erlangen,49.53530551899356,10.893663089997254,49.64013443292672,11.07554098888691
-Ingolstadt,48.615608086215175,11.232933428311759,48.893652866507985,11.728832483590338
-EOF
+sed "s/PLUGIN_LIST/$plugins/;" <debian/bin/preferences >"$jar_path/preferences"
+cp nsis/bookmarks "$jar_path/bookmarks"