--- josm-0.0.0.20080713.orig/debian/josm.dirs
+++ josm-0.0.0.20080713/debian/josm.dirs
@@ -0,0 +1,4 @@
+/usr/bin
+/usr/share/josm
+/usr/share/pixmaps
+/usr/share/applications
--- josm-0.0.0.20080713.orig/debian/rules
+++ josm-0.0.0.20080713/debian/rules
@@ -0,0 +1,52 @@
+#!/usr/bin/make -f
+# debian/rules file for josm (uses cdbs)
+  
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+
+JAVA_HOME := /usr/lib/jvm/java-6-openjdk/
+ANT_HOME  := /usr/share/ant
+DEB_ANT_BUILD_TARGET := dist
+
+# Dependencies
+DEB_JARS := /usr/share/java/gettext-commons.jar
+DEB_JARS += /usr/share/java/metadata-extractor.jar
+# Docs are already included in the jar file and can be accessed from within josm.
+#DEB_INSTALL_DOCS_ALL :=
+
+SVNREPO := http://josm.openstreetmap.de/svn/trunk
+DATE := $(shell date +%Y%m%d)
+
+clean::
+	dh_clean $(CURDIR)/REVISION
+
+configure/josm::
+	echo Revision: ${DEB_VERSION} > $(CURDIR)/REVISION
+
+install/josm::
+	install -m 644 $(CURDIR)/dist/josm-custom.jar $(CURDIR)/debian/josm/usr/share/josm/josm-${DEB_UPSTREAM_VERSION}.jar
+	dh_link usr/share/josm/josm-${DEB_UPSTREAM_VERSION}.jar usr/share/josm/josm.jar
+	install -m 755 $(CURDIR)/debian/josm.sh $(CURDIR)/debian/josm/usr/bin/josm
+	install -m 644 $(CURDIR)/debian/icons/josm-16.xpm $(CURDIR)/debian/josm/usr/share/pixmaps/josm-16.xpm
+	install -m 644 $(CURDIR)/debian/icons/josm-32.xpm $(CURDIR)/debian/josm/usr/share/pixmaps/josm-32.xpm
+	install -m 644 $(CURDIR)/debian/josm.desktop $(CURDIR)/debian/josm/usr/share/applications/josm.desktop
+
+get-orig-source:
+	dh_testdir
+	test -d ../tarballs/. || mkdir -p ../tarballs
+	@echo Downloading josm from ${SVNREPO}
+	svn export --ignore-externals ${SVNREPO} ../tarballs/josm-0.0.0.${DATE}
+	@echo Removing jar files and test data
+	find ../tarballs/josm-0.0.0.${DATE} -name "*.jar" -exec rm -v {} \;
+	rm -f ../tarballs/josm-0.0.0.${DATE}/data/*
+	@echo Removing icons directory
+	rm -rf ../tarballs/josm-0.0.0.${DATE}/styles/standard/icons/
+	@echo Building snapshot tarball																	
+	tar czf ../tarballs/josm_0.0.0.${DATE}.orig.tar.gz -C ../tarballs josm-0.0.0.${DATE}
+	@echo Cleaning up
+	rm -rf ../tarballs/josm-0.0.0.${DATE}
+	@echo .
+	@echo To update debian/changelog type
+	@echo dch -v 0.0.0.${DATE}-1
+	@echo .
--- josm-0.0.0.20080713.orig/debian/control
+++ josm-0.0.0.20080713/debian/control
@@ -0,0 +1,29 @@
+Source: josm
+Section: utils
+Priority: extra
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
+Uploaders: Andreas Putzo <andreas@putzo.net>, Giovanni Mascellani <g.mascellani@gmail.com>, Petter Reinholdtsen <pere@debian.org>
+DM-Upload-Allowed: yes
+Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), openjdk-6-jdk, libgettext-commons-java, libmetadata-extractor-java
+Standards-Version: 3.8.0
+Homepage: http://josm.openstreetmap.de
+Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm/
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/josm/
+
+Package: josm
+Architecture: all
+Depends:  openjdk-6-jre, libgettext-commons-java, libmetadata-extractor-java, openstreetmap-map-icons-classic
+Recommends: josm-plugins
+Description: Editor for OpenStreetMap
+ JOSM is an editor for OpenStreetMap (OSM) written in Java.
+ The current version supports stand alone GPX tracks, GPX track data
+ from OSM database and existing nodes, line segments and metadata tags
+ from the OSM database.
+ .
+ OpenStreetMap is a project aimed squarely at creating and providing
+ free geographic data such as street maps to anyone who wants them. 
+ The project was started because most maps you think of as free actually
+ have legal or technical restrictions on their use, holding back people
+ from using them in creative, productive or unexpected ways.
+ http://www.openstreetmap.org
--- josm-0.0.0.20080713.orig/debian/changelog
+++ josm-0.0.0.20080713/debian/changelog
@@ -0,0 +1,84 @@
+josm (0.0.0.20080713-1ubuntu1) intrepid; urgency=low
+
+  * Add debian/josm.desktop (LP: #264848)
+
+ -- Nathan Handler <nhandler@ubuntu.com>  Sun, 07 Sep 2008 16:21:00 -0500
+
+josm (0.0.0.20080713-1) unstable; urgency=low
+
+  [ Giovanni Mascellani ]
+  * Bumped Standards-Version to 3.8.0 (no changes needed)
+  * Added Vcs-* fields in debian/control
+
+  [ Andreas Putzo ]
+  * New upstream snapshot fetched from svn, revision 716.
+  * Switched to OpenJDK, dropping support for other JVM's.
+    - Updated build-deps and dependencies accordingly.
+    - Removed gcj specific compiler flags from 10_build.dpatch.
+    - Removed 30_graphics.dpatch.
+    - Updated README.Debian.
+    - Updated wrapper script to choose OpenJDK if no other
+      JVM is given by the user.
+    (Closes: #486293, #474626)
+  * Added patch description to 40_elemstyles.dpatch. 
+  * Mentioned Ellipsoid.java in copyright file. 
+  * Added DM-Upload-Allowed field to debian/control. 
+  * Wrap lines at 80 characters in copyright file. 
+
+ -- Andreas Putzo <andreas@putzo.net>  Sat, 19 Jul 2008 19:51:57 +0000
+
+josm (0.0.0.20080510-1) unstable; urgency=low
+
+  [ Giovanni Mascellani ]
+  * New upstream version fetched using debian/rules get-orig-source.
+    + Many little bugfixes.
+    + Clarifications on upstream copyright status.
+  * Switched to machine interpretable debian/copyright.
+
+  [ Andreas Putzo ]
+  * Replace dependency on java-gcj-compat with gij-4.1 or jamvm that
+    work with josm. Add those to recommends to increase the chance 
+    that a working java can be found by the wrapper. (Closes: #475878)
+  * Add josm-plugins among Recommends. 
+
+  [ Petter Reinholdtsen ]
+  * Change debian packaging to GPL v2 and later, to be compatible with
+    the rest of the package, after clearing it with Andreas Putzo and
+    Giovanni Mascellani.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sat, 10 May 2008 18:30:01 +0200
+
+josm (0.0.0.20080330-1) unstable; urgency=low
+
+  [ Giovanni Mascellani ]
+  * Added myself into uploaders
+  * patches/40_elemstyles:
+    + Icons are searched both in openstreetmap-map-icons-classic and
+      openstreetmap-map-icons-square
+    + elemstyles.xml doesn't contain absolute paths to icons
+
+  [ Petter Reinholdtsen ]
+  * New upstream version fetched using debian/rules get-orig-source.
+    - Drop patch 50_OsmServerWriter now applied upstream.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sun, 30 Mar 2008 17:52:44 +0200
+
+josm (0.0.0.20080316-2) unstable; urgency=low
+
+  [ Andreas Putzo ]
+  * Add 50_OsmServerWriter.dpatch to allow uploading with gcj.
+  * Suppress some compiler warnings (serial, unusedImport) in build.xml.
+  * Update wrapper script to choose a working jvm (Closes: #472285).
+
+  [ Petter Reinholdtsen ]
+  * Change wrapper script selection algorithm to try the users preference as
+    defined by $JAVA_HOME first.  Next, the other JVMs known to work with josm,
+    with the one working best first, and the less functional ones after that.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Wed, 26 Mar 2008 10:15:38 +0100
+
+josm (0.0.0.20080316-1) unstable; urgency=low
+
+  * Initial release (Closes: #385371)
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sun, 16 Mar 2008 14:57:52 +0100
--- josm-0.0.0.20080713.orig/debian/josm.desktop
+++ josm-0.0.0.20080713/debian/josm.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=Josm
+GenericName=Java OpenStreetMap Editor
+Comment=Editor for OpenStreetMap.com
+Exec=josm
+Icon=josm-32
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=Education;Science;Geoscience;
--- josm-0.0.0.20080713.orig/debian/josm.1
+++ josm-0.0.0.20080713/debian/josm.1
@@ -0,0 +1,27 @@
+.TH JOSM 1 "September  8, 2007"
+.\" Please adjust this date whenever revising the manpage.
+.SH NAME
+josm \- Java OpenStreetMap Editor
+.SH SYNOPSIS
+.B josm
+.SH DESCRIPTION
+.B josm 
+is an editor for OpenStreetMap written in Java 1.5. 
+.PP
+.B OpenStreetMap 
+is a project aimed squarely at creating and providing free geographic data such as street maps to anyone
+who wants them. It allows you to view, edit and use geographical data in a collaborative way from 
+anywhere on earth.
+The project was started because most maps you think of as free actually have legal or technical 
+restrictions on their use, holding back people from using them in creative, productive or unexpected
+ways.
+.SH OPTIONS
+This program does not accept command line options. 
+.SH SEE ALSO
+.BR josm-plugins (1).
+.SH AUTHOR
+josm was written by Immanuel Scholz.
+The current maintainer is Frederik Ramm.
+.PP
+This manual page was written by Andreas Putzo <andreas@putzo.net>,
+for the Debian project (but may be used by others).
--- josm-0.0.0.20080713.orig/debian/compat
+++ josm-0.0.0.20080713/debian/compat
@@ -0,0 +1 @@
+5
--- josm-0.0.0.20080713.orig/debian/ant.properties
+++ josm-0.0.0.20080713/debian/ant.properties
@@ -0,0 +1,2 @@
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5
--- josm-0.0.0.20080713.orig/debian/copyright
+++ josm-0.0.0.20080713/debian/copyright
@@ -0,0 +1,96 @@
+This package was debianized by Andreas Putzo <andreas@putzo.net> on
+Mon, 04 Sep 2007 12:16:50 +0200.
+
+It was downloaded using the command svn export
+http://josm.openstreetmap.de/svn/trunk.  All .jar files have been removed.  All
+files in the data/ directory have been removed because they contain (large) test
+data that is not used by the program.  The directory styles/standard/icons has
+been removed. It contains icons that are already provided by the
+openstreetmap-map-icons-classic package.  All other downloaded files have been
+packaged as GNU zip'ed tarball without any further modifications.
+
+
+Files: *
+Copyright: Copyright (c) 2005-2008 Immanuel Scholz <imi@eigenheimstrasse.de>
+           Copyright (c) 2007-2008 Frederik Ramm <frederik@remote.org>
+           Copyright (c) 2007-2008 Gabriel Ebner <ge@gabrielebner.at>
+           Copyright (c) 2007-2008 David Earl <david@frankieandshadow.com>
+           Copyright (c) 2007-2008 Ulf Lamping <ulf.lamping@web.de>
+           Copyright (c) 2007-2008 Raphael Mack <ramack@raphael-mack.de>
+License: GPL-2+
+ Josm is distributed under the GPL, version 2 or later.  On Debian GNU/Linux
+ systems, the complete text of the GNU General Public License Version 2 can be
+ found in `/usr/share/common-licenses/GPL-2'.
+
+Files: debian/*
+Copyright: Copyright (c) 2007-2008 Andreas Putzo
+           Copyright (c) 2008 Petter Reinholdtsen
+           Copyright (c) 2008 Giovanni Mascellani
+License: GPL-2+
+ The Debian packaging information is under the GPL, version 2 or later.  On
+ Debian GNU/Linux systems, the complete text of the GNU General Public License
+ Version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+Files: src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java
+Copyright: Copyright (c) 1994-2007 Sun Microsystems, Inc.
+License: other
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+  * Redistribution of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+ .
+  * Redistribution in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+ .
+ Neither the name of Sun Microsystems, Inc. or the names of contributors may be
+ used to endorse or promote products derived from this software without specific
+ prior written permission.
+ .
+ This software is provided "AS IS," without a warranty of any kind. ALL EXPRESS
+ OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED
+ WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
+ NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN MICROSYSTEMS, INC. ("SUN") AND ITS
+ LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT
+ OF USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO
+ EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT
+ OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED
+ OF THE POSSIBILITY OF SUCH DAMAGES.
+ .
+ You acknowledge that this software is not designed, licensed or intended for
+ use in the design, construction, operation or maintenance of any nuclear
+ facility.
+
+Files: images/world.jpg
+Copyright: Courtesy NASA/JPL-Caltech
+License: other
+ (Copied from http://www.jpl.nasa.gov/images/policy/index.cfm)
+ .
+ Unless otherwise noted, images and video on JPL public web sites (public sites
+ ending with a jpl.nasa.gov address) may be used for any purpose without prior
+ permission, subject to the special cases noted below. Publishers who wish to
+ have authorization may print this page and retain it for their records; JPL
+ does not issue image permissions on an image by image basis.
+ .    
+ By electing to download the material from this web site the user agrees:
+ .    
+ 1. that Caltech makes no representations or warranties with respect to
+ ownership of copyrights in the images, and does not represent others who may
+ claim to be authors or owners of copyright of any of the images, and makes no
+ warranties as to the quality of the images. Caltech shall not be responsible
+ for any loss or expenses resulting from the use of the images, and you release
+ and hold Caltech harmless from all liability arising from such use.
+ .    
+ 2. to use a credit line in connection with images. Unless otherwise noted in
+ the caption information for an image, the credit line should be "Courtesy
+ NASA/JPL-Caltech."
+ .    
+ 3. that the endorsement of any product or service by Caltech, JPL or NASA must
+ not be claimed or implied. 
+
+Files: src/org/openstreetmap/josm/data/projection/Ellipsoid.java
+Copyright: Copyright (c) 2002 Johan Montagnat <johan@creatis.insa-lyon.fr>
+License: GPL-2
--- josm-0.0.0.20080713.orig/debian/josm.sh
+++ josm-0.0.0.20080713/debian/josm.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+# Simple wrapper script used to start JOSM in Debian
+set -e
+
+# First, the users preference as defined by $JAVA_HOME. Next, use OpenJDK.
+# Override to a specific one using $JAVACMD
+JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-6-openjdk/bin/java"
+
+for jcmd in $JAVA_CMDS; do 
+    if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
+        JAVACMD="$jcmd"
+    fi
+done
+
+if [ "$JAVACMD" ]; then
+    echo "Using $JAVACMD to execute josm."
+    exec $JAVACMD -jar /usr/share/josm/josm.jar "$@"
+else    
+    echo "No valid JVM found to run JOSM."
+    exit 1
+fi
--- josm-0.0.0.20080713.orig/debian/josm.menu
+++ josm-0.0.0.20080713/debian/josm.menu
@@ -0,0 +1,2 @@
+?package(josm): needs="X11" section="Applications/Science/Geoscience" title="Josm" command="/usr/bin/josm"\
+icon16x16="/usr/share/pixmaps/josm-16.xpm" icon32x32="/usr/share/pixmaps/josm-32.xpm"
--- josm-0.0.0.20080713.orig/debian/README.Debian
+++ josm-0.0.0.20080713/debian/README.Debian
@@ -0,0 +1,10 @@
+Josm for Debian
+---------------
+
+By default josm is launched using OpenJDK-6. This can be overridden
+by exporting the JAVACMD or JAVA_HOME environment variables before
+running josm.
+Note that JOSM doesn't follow the alternative system 
+in /etc/alternatives/ that is usually used on Debian systems.
+
+ -- Andreas Putzo <andreas@putzo.net>  Sun, 13 Jul 2008 19:16:59 +0000
--- josm-0.0.0.20080713.orig/debian/manpages
+++ josm-0.0.0.20080713/debian/manpages
@@ -0,0 +1 @@
+debian/josm.1
--- josm-0.0.0.20080713.orig/debian/josm.examples
+++ josm-0.0.0.20080713/debian/josm.examples
@@ -0,0 +1 @@
+start.html
--- josm-0.0.0.20080713.orig/debian/icons/josm-32.xpm
+++ josm-0.0.0.20080713/debian/icons/josm-32.xpm
@@ -0,0 +1,295 @@
+/* XPM */
+static char *josm32x32[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c black",
+".  c #0D0C0C",
+"X  c #160E06",
+"o  c #1D1E1A",
+"O  c #191B16",
+"+  c #13100E",
+"@  c #1D201A",
+"#  c #221A11",
+"$  c #2E1802",
+"%  c #231F26",
+"&  c #312311",
+"*  c #232322",
+"=  c #2B2C2B",
+"-  c #272826",
+";  c #2D302F",
+":  c #30312D",
+">  c #34392E",
+",  c #353534",
+"<  c #363931",
+"1  c #3B3C3C",
+"2  c #363739",
+"3  c #2E2D31",
+"4  c #271740",
+"5  c #3D3C46",
+"6  c #3E413A",
+"7  c #30412B",
+"8  c #46290B",
+"9  c #4E3C13",
+"0  c #4A3B1A",
+"q  c #543B13",
+"w  c #58320B",
+"e  c #403E3F",
+"r  c #4A3E37",
+"t  c #503D2F",
+"y  c #603A11",
+"u  c #473A5F",
+"i  c #513F70",
+"p  c #544312",
+"a  c #5C4713",
+"s  c #5D4913",
+"d  c #5D4918",
+"f  c #43493D",
+"g  c #47443B",
+"h  c #465C37",
+"j  c #5B4A29",
+"k  c #57493A",
+"l  c #5B522F",
+"z  c #634B13",
+"x  c #6B4E11",
+"c  c #614A18",
+"v  c #6E540F",
+"b  c #6A561B",
+"n  c #70530F",
+"m  c #715210",
+"M  c #634F20",
+"N  c #634F3A",
+"B  c #6C5823",
+"V  c #62573A",
+"C  c #725E25",
+"Z  c #78593A",
+"A  c #6F6039",
+"S  c #444444",
+"D  c #4B4B4B",
+"F  c #464845",
+"G  c #4F4B52",
+"H  c #4E534F",
+"J  c #4F5848",
+"K  c #514E4D",
+"L  c #5A4641",
+"P  c #514D56",
+"I  c #535B4D",
+"U  c #52574B",
+"Y  c #535254",
+"T  c #585D53",
+"R  c #5C5C5C",
+"E  c #575A53",
+"W  c #5A5270",
+"Q  c #5D615C",
+"!  c #5A6452",
+"~  c #556C46",
+"^  c #5F767F",
+"/  c #5F6560",
+"(  c #625E5A",
+")  c #636759",
+"_  c #6D7A5F",
+"`  c #786D58",
+"'  c #776A44",
+"]  c #626262",
+"[  c #6A6A6A",
+"{  c #676966",
+"}  c #6A6972",
+"|  c #6D7561",
+" . c #6E716D",
+".. c #786D67",
+"X. c #737969",
+"o. c #717272",
+"O. c #7B7B7B",
+"+. c #777778",
+"@. c #5E5987",
+"#. c #7D7D81",
+"$. c #679743",
+"%. c #709250",
+"&. c #6D9879",
+"*. c #76836B",
+"=. c #7C866A",
+"-. c #7C8B75",
+";. c #788F69",
+":. c #74A848",
+">. c #79AB53",
+",. c #7DB551",
+"<. c #6EA257",
+"1. c #72AA75",
+"2. c #6598B8",
+"3. c #709BB8",
+"4. c #6599A1",
+"5. c #6FA0B6",
+"6. c #5C8BCD",
+"7. c #83592C",
+"8. c #8C6338",
+"9. c #876947",
+"0. c #877A5A",
+"q. c #807969",
+"w. c #847B87",
+"e. c #806F98",
+"r. c #8B7CA0",
+"t. c #838356",
+"y. c #918054",
+"u. c #82867D",
+"i. c #8B9D7C",
+"p. c #889579",
+"a. c #978566",
+"s. c #998876",
+"d. c #8A9772",
+"f. c #84B75C",
+"g. c #87AB69",
+"h. c #8FA17E",
+"j. c #88B765",
+"k. c #94B973",
+"l. c #AD9A7D",
+"z. c #A6846A",
+"x. c #B1A976",
+"c. c #B8BA7D",
+"v. c #89C656",
+"b. c #91C466",
+"n. c #9BC675",
+"m. c #96D663",
+"M. c #A1DB6C",
+"N. c #BEC17D",
+"B. c #A6DD79",
+"V. c #838484",
+"C. c #8B8B8B",
+"Z. c #8A8784",
+"A. c #99978B",
+"S. c #929294",
+"D. c #9A9A9A",
+"F. c #9F9EA0",
+"G. c #92A381",
+"H. c #94AD81",
+"J. c #9BAB89",
+"K. c #98A886",
+"L. c #9BB18C",
+"P. c #9DB787",
+"I. c #8EAFA3",
+"U. c #9ABCA7",
+"Y. c #A69A8D",
+"T. c #A5A48C",
+"R. c #A5BB8B",
+"E. c #A2B295",
+"W. c #A6BB98",
+"Q. c #AFB698",
+"!. c #A3A3A4",
+"~. c #ABABAB",
+"^. c #A7A7A8",
+"/. c #B6ADBB",
+"(. c #B4BAA6",
+"). c #B4B4B4",
+"_. c #BCBCBC",
+"`. c #BEB9B4",
+"'. c #AFB3A4",
+"]. c #B8A7C3",
+"[. c #A7C78B",
+"{. c #ACC295",
+"}. c #AEC39A",
+"|. c #AFCC96",
+" X c #B1C49D",
+".X c #B3C99D",
+"XX c #B6C699",
+"oX c #B8D19C",
+"OX c #ACD28B",
+"+X c #A7C6A8",
+"@X c #B2C4A4",
+"#X c #B7C4AA",
+"$X c #B5CBA3",
+"%X c #B9CDA2",
+"&X c #B7CDA9",
+"*X c #BDCCB4",
+"=X c #BCD4A4",
+"-X c #B8D4AB",
+";X c #B0E286",
+":X c #DBBC92",
+">X c #CDB993",
+",X c #C1BFBD",
+"<X c #E0BA90",
+"1X c #DACD9E",
+"2X c #D4C499",
+"3X c #C9C599",
+"4X c #CCC7B9",
+"5X c #C2DBAB",
+"6X c #C4D6AB",
+"7X c #C8DAB7",
+"8X c #DCD2A3",
+"9X c #DFDBA8",
+"0X c #D0C5A4",
+"qX c #C2E6A3",
+"wX c #CDE5B6",
+"eX c #CEF2AB",
+"rX c #DCE1AE",
+"tX c #D4EBB5",
+"yX c #D4EBBB",
+"uX c #DCEDB7",
+"iX c #D6E5BA",
+"pX c #D1F2AF",
+"aX c #D7F3B9",
+"sX c #DBF5BD",
+"dX c #D9F6B8",
+"fX c #E2CB9D",
+"gX c #E2CDA1",
+"hX c #E2D3A3",
+"jX c #E3DAAA",
+"kX c #E4EAB7",
+"lX c #E4F5BD",
+"zX c #E1F9BE",
+"xX c #C3C3C3",
+"cX c #CCCCCC",
+"vX c #C8C8C5",
+"bX c #CDD7C5",
+"nX c #D3D3D3",
+"mX c #DCDCDC",
+"MX c #D9D8D6",
+"NX c #D2D3C3",
+"BX c #D4E9C7",
+"VX c #DCF5C2",
+"CX c #DFFAC1",
+"ZX c #D0E0CB",
+"AX c #E1E5DC",
+"SX c #E1F6C4",
+"DX c #E3FCC4",
+"FX c #E6FEC9",
+"GX c #EDE9D0",
+"HX c #E4E4E4",
+"JX c #ECECEC",
+"KX c #E7E8E7",
+"LX c #F4F4F4",
+"PX c #FCFDFC",
+"IX c #F5FFFF",
+"UX c #E7F2E1",
+"YX c None",
+/* pixels */
+"^.C.nXYXYXYXYXYXPXLXYXYXYXi u e.YXYXR D o = - R C.YXF S YXYXYXYX",
+"S.< > : = 2 ].YXPX).2 3 , < 6 g = 3 2 S D H D S 3 - < , PXYXYXYX",
+"PX1 d.G.| k e , = 6 I *.;.j.oXu.3 R [ R Y H R ] [ K g < [ YXYXYX",
+"YX: K.FXuX>X XG.h.{.qXqX;XeXK.! o.R ) =.) =.*.*.U ]  .1 D PXYXYX",
+"YX= X.DXjXgXFXSXCXdX;Xm.M.H.Q  .I u.*X7X{.n.j.R.W.*.I +.D D YXYX",
+"YXY I tXSXhXgXDXCXCXdXM.,.I -.I R.*XZXBX-X[.[.R..X@XG.! +.1 Y YX",
+"YXPXF .XFXlXgXDXsXCXdXB.~ O.~ ;.=X7XAXUX7X7X{.|.}.wX.XG.{ { 3 YX",
+"YXYX= G.FXlXfXDXsXsXsXOX! +.6 :.j.OXwXZX&XW.+XL.}.5XoX-X! w.1 1 ",
+"YXYX, G.CXhXhXCXVXsXsXg. .Q $.$.>.>.n.OXk.k.k.@XL.@XR.-XI [ Q = ",
+"YXPXg $XkXfXsXVXaXtXaXd.V.J :.:.1.1.v.v.,.v.k..XW.&X=XqX> Y o.1 ",
+"YXG E wXhXkXDXzXVXVXpX*.C.h :.$.5.6.4.f.>.n.P.$XE.wX{.T.* L O.g ",
+"YX, X.CXjXjXDXzXVXaXwX%.S.! :.<.2.6.4.,.,.n.{.}.+X$XoX_ # L 4.5 ",
+"YX= G.DXuX8XfXkXsXaXeXd.C.| 1.&.2.3.6.+Xk.f.[.(.@X.X.Xf - } O., ",
+"YX6 .XDXDXDXkX<XrXeXeX.X-.#.@.I.&XU.5.U.{..X#X#XW.-XH.@ + S.] 1 ",
+"4 f 6XsXsXDXhXfXuXVXsXyX .S.T }.=X-X[.|.$X@X*X(.@X}.i.- S D.S C.",
+"YX6 {.DXsXuX2XuXyXrXsXDXJ.o.[ | =X[.oXoXW.&XE.(.E.@Xi.< O.] D YX",
+"YX2 p.DXDXzXhX1X8X<X:X4XK.H V.H p.R.J.L.p.L.p.E.'.#X*.R [ , V.YX",
+"YX2 ) yXDXDXzX1X1XQ.z.q.H o.C.O.E ! t.0.=.i.*.J.K.u.+.R 2 ] YXYX",
+"YXP H &XVXzXCXDXc.C c j o.S.C.T R [ R L ` u.] q.V.S.[ L e IXYXYX",
+"YXYX1 W.BXCXDXc.b 9 9 z V Z./ -.p.( S.~./.,XxXxXcX).T.3X! R YXYX",
+"YXYX3 i.VXwXc.b 9 9 p c z l -.7X8X(.xX_._.,XcXcXMXKXAXbX| e YXYX",
+"YXYX, J.zXc.B 0 9 p a z v d T.sX4XxXD.z.0.l.Y.q.s.'.KXKXO.e YXYX",
+"YXPXg $XN.b 9 9 p a z x m d Q.yXvXS.Z 7.8.9.8.' N r { nX_.Z.YXYX",
+"YX5 ! x.B 9 9 p a z x n z 0.dXiXvX9.w w y y w 8 & # + C.,X).^.^.",
+"YXK l b 9 0 p d z x n x 9.6XyXwXcX,XN 8 8 $ $ $ X X D ).nXnXcX_.",
+"GX0.s 9 p p a z v v z Z 2XgX2X2X4XLXMXA.` k r g ( C.~.`.cXmXHXxX",
+"x.b q 9 p s z x v s 0.1X9XwXXXrX7XLXPXPXKXmXnXnXnXxX/.~._.*XnX_.",
+"z.z p p a z x m s ' W.i.` I F I u.HXPXPXPXLXHXmXnXxX,X^.).]._.).",
+"l.B p s z x n z 0 f f F D +.w.% [ xXJXPXPXLXJXHXMXcX).^.).).~.YX",
+"GXa.c z x m a l ..} @.YXPXPXYXYXPX/._.MXHXKXmXnX_.^.^.)._.LXYXYX",
+"YXNX0.c x x j ..YXYXYXYXYXYXYXYXYXYX~.).~.^.D.D.D.F.).YXYXYXYXYX",
+"YXYX4X` V I q.YXYXYXYXYXYXYXYXYXmXmXYX).).!.D.^.).nXYXYXYXYXYXYX"
+};
--- josm-0.0.0.20080713.orig/debian/icons/josm-16.xpm
+++ josm-0.0.0.20080713/debian/icons/josm-16.xpm
@@ -0,0 +1,271 @@
+/* XPM */
+static char *josm16x16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 249 2",
+"   c black",
+".  c #07040B",
+"X  c #0A0E14",
+"o  c #0E0815",
+"O  c #120B19",
+"+  c #262932",
+"@  c #2D312C",
+"#  c #333534",
+"$  c #373737",
+"%  c #363831",
+"&  c #383539",
+"*  c #393837",
+"=  c #38383B",
+"-  c #393A39",
+";  c #393B38",
+":  c #3E3D3E",
+">  c #3F413B",
+",  c #503E11",
+"<  c #503E12",
+"1  c #423425",
+"2  c #493929",
+"3  c #524013",
+"4  c #534013",
+"5  c #5C4611",
+"6  c #5C4713",
+"7  c #44453F",
+"8  c #5F4326",
+"9  c #5E4820",
+"0  c #5F4F21",
+"q  c #564F35",
+"w  c #5D4833",
+"e  c #604C18",
+"r  c #634E18",
+"t  c #684C10",
+"y  c #684D11",
+"u  c #694D10",
+"i  c #694E10",
+"p  c #6D4A27",
+"a  c #655021",
+"s  c #655223",
+"d  c #685823",
+"f  c #635435",
+"g  c #724D26",
+"h  c #775E27",
+"j  c #706035",
+"k  c #766631",
+"l  c #7A6536",
+"z  c #7B703D",
+"x  c #7F743D",
+"c  c #444442",
+"v  c #444741",
+"b  c #454642",
+"n  c #454545",
+"m  c #464547",
+"M  c #464647",
+"N  c #474846",
+"B  c #494D41",
+"V  c #4F4944",
+"C  c #49484A",
+"Z  c #4B4A4B",
+"A  c #4B4D49",
+"S  c #4C4B4C",
+"D  c #4D5145",
+"F  c #4A5A40",
+"G  c #514F50",
+"H  c #545B4F",
+"J  c #565855",
+"K  c #595959",
+"L  c #5D5F5A",
+"P  c #5D5D5D",
+"I  c #5E5D5E",
+"U  c #58624C",
+"Y  c #5D6454",
+"T  c #5D625A",
+"R  c #5E6558",
+"E  c #615F51",
+"W  c #636F5A",
+"Q  c #646C5C",
+"!  c #6C6852",
+"~  c #68775D",
+"^  c #69775D",
+"/  c #7F6E44",
+"(  c #7E704A",
+")  c #616161",
+"_  c #696E64",
+"`  c #6A6D66",
+"'  c #6B6F67",
+"]  c #6B6A6B",
+"[  c #6A6F69",
+"{  c #6C6C6C",
+"}  c #697261",
+"|  c #697361",
+" . c #6D7864",
+".. c #777062",
+"X. c #737569",
+"o. c #70786B",
+"O. c #707371",
+"+. c #747A71",
+"@. c #787F75",
+"#. c #7E7C7B",
+"$. c #678054",
+"%. c #689745",
+"&. c #6B9A55",
+"*. c #7A856D",
+"=. c #7B8675",
+"-. c #7C817B",
+";. c #7AAE67",
+":. c #74AA7B",
+">. c #769682",
+",. c #6395B1",
+"<. c #80723F",
+"1. c #817C79",
+"2. c #8A8E67",
+"3. c #82877B",
+"4. c #818E72",
+"5. c #8E887A",
+"6. c #8B9272",
+"7. c #88967A",
+"8. c #899A78",
+"9. c #8A9978",
+"0. c #8D987B",
+"q. c #8F9C7F",
+"w. c #8E9F7F",
+"e. c #908172",
+"r. c #9A9771",
+"t. c #86AA67",
+"y. c #8CBC60",
+"u. c #8FBD6B",
+"i. c #96B17E",
+"p. c #93C175",
+"a. c #9DC07C",
+"s. c #868680",
+"d. c #868D81",
+"f. c #8E9D82",
+"g. c #8F9D85",
+"h. c #909C87",
+"j. c #919191",
+"k. c #939393",
+"l. c #979A92",
+"z. c #96A782",
+"x. c #9CA282",
+"c. c #9DAC8A",
+"v. c #9DAE8B",
+"b. c #9AA490",
+"n. c #9DA19B",
+"m. c #87AEB1",
+"M. c #86B0AA",
+"N. c #AC9E84",
+"B. c #AEA58E",
+"V. c #A9AA86",
+"C. c #AAAA89",
+"Z. c #ACA39B",
+"A. c #ACA79A",
+"S. c #A0BC85",
+"D. c #A0BD8C",
+"F. c #A5BD8F",
+"G. c #A6BB92",
+"H. c #A9B492",
+"J. c #A9B791",
+"K. c #ACBC95",
+"L. c #BAAF84",
+"P. c #B4A596",
+"I. c #B5AA9E",
+"U. c #A0A0A0",
+"Y. c #A1A1A1",
+"T. c #A4A4A4",
+"R. c #A5A5A5",
+"E. c #A6A7A6",
+"W. c #A7A7A7",
+"Q. c #AEAEAE",
+"!. c #B0BCA6",
+"~. c #B1B1B1",
+"^. c #B2B2B2",
+"/. c #B4B4B4",
+"(. c #B5B5B5",
+"). c #B6B6B6",
+"_. c #BCB6B0",
+"`. c #BBBBBB",
+"'. c #BEBEBE",
+"]. c #A1C184",
+"[. c #ACCB8E",
+"{. c #A8C191",
+"}. c #A9C097",
+"|. c #AAC792",
+" X c #AFC797",
+".X c #ADC09A",
+"XX c #ACC39F",
+"oX c #AEC19E",
+"OX c #AFC29F",
+"+X c #AEC599",
+"@X c #ADC89A",
+"#X c #B1C59F",
+"$X c #B2CA9B",
+"%X c #B3CF99",
+"&X c #BADE98",
+"*X c #B4C7A3",
+"=X c #B6CAA3",
+"-X c #B7CEA2",
+";X c #BED3A5",
+":X c #B9D0AA",
+">X c #B4E689",
+",X c #C2BFAC",
+"<X c #CFC196",
+"1X c #C4D5A1",
+"2X c #C7D7AC",
+"3X c #C2D9A8",
+"4X c #C2D2BA",
+"5X c #DDD7A6",
+"6X c #DEDEAC",
+"7X c #D5D9B0",
+"8X c #D0E0A6",
+"9X c #DDE0AE",
+"0X c #D4E9B6",
+"qX c #DCE8B4",
+"wX c #DEE9B6",
+"eX c #DFECB8",
+"rX c #DFEDB8",
+"tX c #DBF0B5",
+"yX c #D8F4BA",
+"uX c #DBF7BF",
+"iX c #DFF4BD",
+"pX c #DDF8BF",
+"aX c #E2DBAA",
+"sX c #E4E1AE",
+"dX c #E3E6B2",
+"fX c #E5E3B2",
+"gX c #E2EFB9",
+"hX c #C0C0C0",
+"jX c #C7C7C7",
+"kX c #C7C7C8",
+"lX c #CECCC2",
+"zX c #CED1C8",
+"xX c #D0CFCF",
+"cX c #D1D3C9",
+"vX c #D0D0D0",
+"bX c #D3D3D3",
+"nX c #D9D9D9",
+"mX c #D0E2C3",
+"MX c #DAF4C3",
+"NX c #DFFAC2",
+"BX c #E2F7C0",
+"VX c #E3FAC2",
+"CX c #E6F6D6",
+"ZX c #E2E2E2",
+"AX c #E5E4E4",
+"SX c #EAEAEA",
+"DX c #FBFBFB",
+"FX c gray100",
+"GX c None",
+/* pixels */
+"7 B @ . O & F U - M M C : % > GX",
+"D c.C.0.8.i.a.4.J ' Q } T A M GX",
+"; K.fXwXyX>Xt.' g.4X|.S.v.o.K = ",
+"  w.rXfXpX&X~ $.[.mX:XK.-XF.[ C ",
+"  w.9XeXuX X} %.;.p.u.D.XX+XT I ",
+"$ J.sXBXpXF. .&.,.:.y.{.=Xz.N ] ",
+"H ;XgXaXtX%X-.>.m.M.].OX=X~ S { ",
+"Y 3XiX5XwX0Xd.=.$X@XOX!.oXQ ) P ",
+"v .XpX9X<XN.+.O.*.6.0.g.b.` G # ",
+"o f.uX7X<.9 ..@.X.1.l.l.W.5.E GX",
+"  9.1Xz < 5 s H.4XZ.P.I._.cX3.GX",
+"+ 2.x < 5 u k 2XB.p p 8 1 1.'.).",
+"( 0 3 6 u h L.7X7X1.w 2 V j.vXbX",
+"l 3 6 u d r.V.x.xXDXAXvXkX/.`.kX",
+"/ r u r q R c o ^.ZXSXnXhXQ.~.~.",
+"B.j a f FXGXGXGXk./.^.R.Y.W.GXGX"
+};
--- josm-0.0.0.20080713.orig/debian/patches/40_elemstyles.dpatch
+++ josm-0.0.0.20080713/debian/patches/40_elemstyles.dpatch
@@ -0,0 +1,60 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_elemstyles.dpatch by Andreas Putzo <andreas@putzo.net>
+##
+## DP: The icons have been removed from the JAR file because they are
+## DP: already provided by the openstreetmap-map-icons-* packages.
+## DP: Point josm to the correct directory so that the icons are found.
+
+@DPATCH@
+diff -urNad josm-0.0.0.20080518~/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java josm-0.0.0.20080518/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java
+--- josm-0.0.0.20080518~/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java	2008-05-18 17:20:35.000000000 +0200
++++ josm-0.0.0.20080518/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java	2008-05-18 17:24:31.000000000 +0200
+@@ -26,6 +26,11 @@
+ 	long curScaleMax = 1000000000;
+ 	long curScaleMin = 0;
+ 
++	public final static String[] iconDefaultLocations = {
++		"/usr/share/icons/openstreetmap/classic.small/",
++		"/usr/share/icons/openstreetmap/square.small/"
++		};
++
+ 	public ElemStyleHandler() {
+ 		inDoc=inRule=inCondition=inElemStyle=inLine=inIcon=inArea=false;
+ 	}
+@@ -85,21 +90,23 @@
+ 							//open icon from user directory
+ 							curIcon = new ImageIcon(imageFile);
+ 						} else {
+-							try {
+-								URL path = getClass().getResource("/styles/standard/icons/"+atts.getValue(count));
+-								if (path == null) {
+-									/* icon not found, using default */
+-									System.out.println("Mappaint: Icon " + atts.getValue(count) + " not found, using default icon");
+-									path = getClass().getResource("/styles/standard/icons/misc/no_icon.png");
+-									curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
++							for (String location : this.iconDefaultLocations) {
++ 								imageFile = location + atts.getValue(count);
++								f = new File(imageFile);
++								if (f.exists()) {
++									// open icon from system directory
++									curIcon = new ImageIcon(imageFile);
++									break;
+ 								} else {
+-									curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
++									f = null;
+ 								}
+-							}
+-							catch (Exception e){
+-								URL path = getClass().getResource("/styles/standard/icons/amenity.png");
+-								curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
+-							}
++							}
++                            if (f == null) {
++                                /* icon not found, using default */
++								System.out.println("Mappaint: Icon " + atts.getValue(count) + " not found, using default icon");
++                                    imageFile = "/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png";
++									curIcon = new ImageIcon(imageFile);
++                            }
+ 						}
+ 					} else if (atts.getQName(count).equals("annotate")) {
+ 						curIconAnnotate = Boolean.parseBoolean (atts.getValue(count));
--- josm-0.0.0.20080713.orig/debian/patches/00list
+++ josm-0.0.0.20080713/debian/patches/00list
@@ -0,0 +1,3 @@
+10_build
+20_bts
+40_elemstyles
--- josm-0.0.0.20080713.orig/debian/patches/20_bts.dpatch
+++ josm-0.0.0.20080713/debian/patches/20_bts.dpatch
@@ -0,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_bts.dpatch by Andreas Putzo <andreas@putzo.net>
+##
+## DP: Point to the debian BTS for bug reports.
+## DP: Pattern match debian version in about dialog.
+
+@DPATCH@
+diff -urNad josm-0.0.0.20080518~/src/org/openstreetmap/josm/actions/AboutAction.java josm-0.0.0.20080518/src/org/openstreetmap/josm/actions/AboutAction.java
+--- josm-0.0.0.20080518~/src/org/openstreetmap/josm/actions/AboutAction.java	2008-05-18 17:16:19.000000000 +0200
++++ josm-0.0.0.20080518/src/org/openstreetmap/josm/actions/AboutAction.java	2008-05-18 17:18:35.000000000 +0200
+@@ -52,7 +52,7 @@
+ 	static {
+ 		revision = loadFile(Main.class.getResource("/REVISION"));
+ 
+-		Pattern versionPattern = Pattern.compile(".*?Revision: ([0-9]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
++		Pattern versionPattern = Pattern.compile(".*?Revision: ([[0-9].-]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
+ 		Matcher match = versionPattern.matcher(revision.getText());
+ 		version = match.matches() ? match.group(1) : "UNKNOWN";
+ 
+@@ -83,7 +83,7 @@
+ 		info.add(new JLabel(tr("Homepage")), GBC.std().insets(0,0,10,0));
+ 		info.add(new UrlLabel("http://josm.openstreetmap.de"), GBC.eol().fill(GBC.HORIZONTAL));
+ 		info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(0,0,10,0));
+-		info.add(new UrlLabel("http://josm.openstreetmap.de/newticket"), GBC.eol().fill(GBC.HORIZONTAL));
++		info.add(new UrlLabel("http://bugs.debian.org"), GBC.eol().fill(GBC.HORIZONTAL));
+ 		info.add(new JLabel(tr("News about JOSM")), GBC.std().insets(0,0,10,0));
+ 		info.add(new UrlLabel("http://www.opengeodata.org/?cat=17"), GBC.eol().fill(GBC.HORIZONTAL));
+ 
+diff -urNad josm-0.0.0.20080518~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java josm-0.0.0.20080518/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
+--- josm-0.0.0.20080518~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java	2008-05-18 17:16:19.000000000 +0200
++++ josm-0.0.0.20080518/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java	2008-05-18 17:17:33.000000000 +0200
+@@ -84,8 +84,8 @@
+ 
+ 			Object[] options = new String[]{tr("Do nothing"), tr("Report Bug")};
+ 			int answer = JOptionPane.showOptionDialog(Main.parent, tr("An unexpected exception occurred.\n\n" +
+-					"This is always a coding error. If you are running the latest\n" +
+-			"version of JOSM, please consider being kind and file a bug report."),
++                    "Please consider being kind and file a bug report.\n" +
++                    "See http://bugs.debian.org for a guide how to do this."),
+ 			tr("Unexpected Exception"), JOptionPane.YES_NO_OPTION, JOptionPane.ERROR_MESSAGE,
+ 			null, options, options[0]);
+ 			if (answer == 1) {
+@@ -117,7 +117,7 @@
+ 					sb.append("\n"+stack.getBuffer().toString());
+ 
+ 					JPanel p = new JPanel(new GridBagLayout());
+-					p.add(new JLabel(tr("Please report a ticket at http://josm.openstreetmap.de/newticket, including your steps to get to\n" +
++					p.add(new JLabel(tr("Please report a bug against josm, including your steps to get to\n" +
+ 							            "the error and be sure to include the following information")), GBC.eol());
+ 					try {
+ 	                    Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(sb.toString()), new ClipboardOwner(){
--- josm-0.0.0.20080713.orig/debian/patches/10_build.dpatch
+++ josm-0.0.0.20080713/debian/patches/10_build.dpatch
@@ -0,0 +1,61 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_build.dpatch by Andreas Putzo <andreas@putzo.net>
+##
+## DP: Adjustments to the ant build file, mainly to not include 
+## DP: the dependencies into the target jar file.
+
+@DPATCH@
+diff -urNad josm-0.0.0.20080316~/build.xml josm-0.0.0.20080316/build.xml
+--- josm-0.0.0.20080316~/build.xml	2008-01-30 17:02:38.000000000 +0000
++++ josm-0.0.0.20080316/build.xml	2008-03-25 19:54:41.000000000 +0000
+@@ -1,23 +1,14 @@
+ <project name="josm" default="dist" basedir=".">
+ 
+-	<!-- All jar files necessary to run only JOSM (no tests) -->
+-	<fileset id="josm_required_libs" dir="lib">
+-		<include name="gettext-commons-0.9.jar"/>
+-		<include name="metadata-extractor-2.3.1-nosun.jar"/>
+-	</fileset>
+-
+ 	<!-- Java classpath addition (all jar files to compile tests with this) -->
+ 	<path id="classpath">
+-		<fileset dir="lib">
+-			<include name="**/*.jar"/>
++		<fileset dir="/usr/share/java">
++            <include name="gettext-commons.jar"/>
++            <include name="metadata-extractor.jar"/>
+ 		</fileset>
+ 	</path>
+ 
+ 	<target name="dist" depends="compile">
+-		<!-- jars -->
+-		<unjar dest="build">
+-			<fileset refid="josm_required_libs" />
+-		</unjar>
+ 
+ 		<!-- images -->
+ 		<copy todir="build/images">
+@@ -31,14 +22,22 @@
+ 
+ 		<!-- styles -->
+ 		<copy todir="build/styles">
+-			<fileset dir="styles" />
++			<fileset dir="styles">
++                <include name="standard/elemstyles.xml"/>
++            </fileset>                
+ 		</copy>
+ 
++        <!-- revision -->
++        <copy todir="build/">
++            <fileset file="REVISION" />
++        </copy>            
++
+ 		<!-- create josm-custom.jar -->
+ 		<delete file="dist/josm-custom.jar"/>
+ 		<jar destfile="dist/josm-custom.jar" basedir="build">
+ 			<manifest>
+ 				<attribute name="Main-class" value="org.openstreetmap.josm.gui.MainApplication" />
++                <attribute name="Class-Path" value="/usr/share/java/gettext-commons.jar /usr/share/java/metadata-extractor.jar" />
+ 			</manifest>
+ 		</jar>
+ 	</target>