[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3514-2

[David Paleino]

The following commit has been merged in the master branch:
commit 224696cbd040e509183e91b45a6c9596ba8ca1ab
Author: David Paleino <dapal at debian.org>
Date:   Wed Oct 6 09:48:34 2010 +0200

    Refresh patch

diff --git a/debian/patches/90-fix_version.patch b/debian/patches/90-fix_version.patch
index 0042d4c..ddf55a8 100644
--- a/debian/patches/90-fix_version.patch
+++ b/debian/patches/90-fix_version.patch
@@ -11,14 +11,14 @@ Forwarded: no
 --- josm.orig/build.xml
 +++ josm/build.xml
 @@ -81,7 +81,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="/usr/share/java/gettext-commons.jar /usr/share/java/metadata-extractor.jar /usr/share/java/signpost-core.jar"/>
+ 			<!-- 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="/usr/share/java/gettext-commons.jar /usr/share/java/metadata-extractor.jar /usr/share/java/signpost-core.jar"/>
 --- josm.orig/src/org/openstreetmap/josm/data/Version.java
 +++ josm/src/org/openstreetmap/josm/data/Version.java
 @@ -206,9 +206,6 @@ public class Version {

-- 
Java OpenStreetMap editor