The following commit has been merged in the master branch:
commit b3994c0465aa8e63b5e9c55498177e538a1d5c32
Author: David Paleino <da...@debian.org>
Date:   Wed Mar 5 21:04:04 2014 +0100

    De-fuzzed 00-build.patch, 05-fix_version.patch and 
06-move_data_out_of_jar.patch

diff --git a/debian/changelog b/debian/changelog
index a371e80..54410ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,10 @@ josm (0.0.svn6502+dfsg2-1) UNRELEASED; urgency=medium
   * Added 04-use_system_jmapviewer.patch to avoid embedding parts of
     jmapviewer in the final JOSM JAR
   * Removed references to embedded jmapviewer in debian/copyright
-  * De-fuzzed 00-build.patch
+  * De-fuzzed 00-build.patch, 05-fix_version.patch and
+    06-move_data_out_of_jar.patch
 
- -- David Paleino <da...@debian.org>  Wed, 05 Mar 2014 20:43:19 +0100
+ -- David Paleino <da...@debian.org>  Wed, 05 Mar 2014 21:03:52 +0100
 
 josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
 
diff --git a/debian/patches/05-fix_version.patch 
b/debian/patches/05-fix_version.patch
index 048c5b4..cc07bd0 100644
--- a/debian/patches/05-fix_version.patch
+++ b/debian/patches/05-fix_version.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
 
 --- josm.orig/build.xml
 +++ josm/build.xml
-@@ -85,7 +85,7 @@ Debian-Release: ${debian.version}
+@@ -86,7 +86,7 @@ Debian-Release: ${debian.version}
              <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a 
non-bzip2 supporting jar -->
              <manifest>
                  <attribute name="Main-class" value="JOSM"/>
diff --git a/debian/patches/06-move_data_out_of_jar.patch 
b/debian/patches/06-move_data_out_of_jar.patch
index dc6cc12..9c44f4e 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -13,7 +13,7 @@ Bug-Debian: 
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608
 
 --- josm.orig/build.xml
 +++ josm/build.xml
-@@ -93,9 +93,9 @@ Debian-Release: ${debian.version}
+@@ -94,9 +94,9 @@ Debian-Release: ${debian.version}
                  <attribute name="Debian-Release" value="${debian.version}"/>
                  <attribute name="Class-Path" value="${classpathprop}"/>
              </manifest>

-- 
Editor for OpenStreetMap

_______________________________________________
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits

Reply via email to