From: Mario Izquierdo <mariodebian@gmail.com>
Subject: fix version numbers to reflect upstream changes
Origin: vendor
Forwarded: not-needed

---
 build.xml                                    |    2 +-
 src/org/openstreetmap/josm/data/Version.java |    3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

--- josm.orig/build.xml
+++ josm/build.xml
@@ -78,7 +78,7 @@ Debian-Release: ${debian.version}
             <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
             <manifest>
                 <attribute name="Main-class" value="JOSM"/>
-                <attribute name="Main-Version" value="${version.entry.commit.revision} SVN"/>
+				<attribute name="Main-Version" value="${version.entry.commit.revision}"/>
                 <attribute name="Main-Date" value="${version.entry.commit.date}"/>
 				<attribute name="Debian-Release" value="${debian.version}"/>
 				<attribute name="Class-Path" value="${classpathprop}"/>
--- josm.orig/src/org/openstreetmap/josm/data/Version.java
+++ josm/src/org/openstreetmap/josm/data/Version.java
@@ -205,9 +205,6 @@ public class Version {
     public String getAgentString() {
         int v = getVersion();
         String s = (v == JOSM_UNKNOWN_VERSION) ? "UNKNOWN" : Integer.toString(v);
-        if (isLocalBuild() && v != JOSM_UNKNOWN_VERSION) {
-            s += " SVN";
-        }
         return "JOSM/1.5 ("+ s+" "+LanguageInfo.getJOSMLocaleCode()+")";
     }
 }