The following commit has been merged in the master branch:
commit e3b751a10db983a9d05cf744bdba9e4368b97617
Author: David Paleino <da...@debian.org>
Date: Sun Oct 3 11:38:36 2010 +0200
debian/patches/90-fix_version.patch added, fix inconsistency between code
and upstream website. Thanks to Mario Izquierdo (Closes: #598920)
diff --git a/debian/changelog b/debian/changelog
index a2c70f7..41bce61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+josm (0.0.svn3514-2) UNRELEASED; urgency=low
+
+ * debian/patches/90-fix_version.patch added, fix inconsistency
+ between code and upstream website. Thanks to Mario Izquierdo
+ (Closes: #598920)
+
+ -- David Paleino <da...@debian.org> Sun, 03 Oct 2010 11:37:39 +0200
+
josm (0.0.svn3514-1) unstable; urgency=low
* New upstream snapshot
diff --git a/debian/patches/90-fix_version.patch
b/debian/patches/90-fix_version.patch
new file mode 100644
index 0000000..0042d4c
--- /dev/null
+++ b/debian/patches/90-fix_version.patch
@@ -0,0 +1,33 @@
+From: Mario Izquierdo <mariodeb...@gmail.com>
+Subject: fix version numbers to reflect upstream changes
+Origin: vendor
+Forwarded: no
+
+---
+ 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
+@@ -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"/>
+--- josm.orig/src/org/openstreetmap/josm/data/Version.java
++++ josm/src/org/openstreetmap/josm/data/Version.java
+@@ -206,9 +206,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()+")";
+ }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 787926b..f6aacf6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
50-preferences_world_readable.patch
70-default_look_and_feel.patch
80-fix_images.patch
+90-fix_version.patch
--
Java OpenStreetMap editor
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
