[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5181+dfsg1-1-12-gfdbcae9

[David Paleino]

The following commit has been merged in the master branch:
commit 9932f25d3718f4b18ea2d1524e90c52f52ef4fd6
Author: David Paleino <dapal at debian.org>
Date:   Fri Jun 8 20:45:13 2012 +0200

    Patches refreshed

diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index eddcf56..4a5fd5e 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -94,7 +94,7 @@ JARs and not depend on Internet connection.
              </manifest>
              <zipfileset dir="images" prefix="images"/>
              <zipfileset dir="data" prefix="data"/>
-@@ -109,30 +107,29 @@ Build-Date: ${build.tstamp}
+@@ -109,25 +107,23 @@ Build-Date: ${build.tstamp}
      </target>
      <target name="javacc">
          <mkdir dir="${mapcss.dir}/parsergen"/>
@@ -115,18 +115,20 @@ JARs and not depend on Internet connection.
              <compilerarg value="-Xlint:deprecation"/>
              <compilerarg value="-Xlint:unchecked"/>
          </javac>
-+		<ant target="build" dir="i18n"/>
++        <ant target="build" dir="i18n"/>
      </target>
      <target name="init">
          <mkdir dir="build"/>
          <mkdir dir="dist"/>
 +        <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${antcontrib.jar}"/>
      </target>
-     <target name="clean">
+     <target name="javadoc">
+         <javadoc destdir="javadoc" 
+@@ -146,6 +142,7 @@ Build-Date: ${build.tstamp}
          <delete dir="build"/>
          <delete dir="dist"/>
          <delete dir="${mapcss.dir}/parsergen"/>
-+		<ant target="clean" dir="i18n"/>
++        <ant target="clean" dir="i18n"/>
      </target>
      <path id="test.classpath">
          <fileset dir="${test.dir}/lib">
diff --git a/debian/patches/40-elemstyles.patch b/debian/patches/40-elemstyles.patch
index eeb071c..e3a42e3 100644
--- a/debian/patches/40-elemstyles.patch
+++ b/debian/patches/40-elemstyles.patch
@@ -14,7 +14,7 @@ applications. This patch points josm to the shared directories.
 
 --- josm.orig/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
 +++ josm/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-@@ -143,14 +143,19 @@ public class MapPaintStyles {
+@@ -144,14 +144,19 @@ public class MapPaintStyles {
          }
  
          if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) {

-- 
Editor for OpenStreetMap