[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn4064-3-9-g3d3dbac

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit 4b6e8e3c6e9589dda59f502b08e33995ebe91f73
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Mon Aug 8 00:45:38 2011 +0200

    Classpath used in compilation.

diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index 5ee2d68..aa34be0 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -13,8 +13,8 @@ JARs and not depend on Internet connection.
 
 Index: josm/build.xml
 ===================================================================
---- josm.orig/build.xml	2011-08-07 13:27:53.000000000 +0200
-+++ josm/build.xml	2011-08-08 00:23:16.000000000 +0200
+--- josm.orig/build.xml	2011-08-08 00:29:12.000000000 +0200
++++ josm/build.xml	2011-08-08 00:44:11.000000000 +0200
 @@ -23,8 +23,13 @@
      </condition>
      <!-- Java classpath addition (all jar files to compile tests with this) -->
@@ -102,7 +102,7 @@ Index: josm/build.xml
      <target name="compile" depends="javacc,init">
 -        <javac srcdir="src" includes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="iso-8859-1"/>
 -        <javac srcdir="src" excludes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="UTF-8">
-+        <javac srcdir="src" excludes="com/**,oauth/**,org/apache/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="UTF-8">
++        <javac srcdir="src" classpathref="classpath" excludes="com/**,oauth/**,org/apache/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="UTF-8">
              <compilerarg value="-Xlint:deprecation"/>
              <compilerarg value="-Xlint:unchecked"/>
          </javac>
@@ -120,8 +120,8 @@ Index: josm/build.xml
          <fileset dir="${test.dir}/lib">
 Index: josm/i18n/build.xml
 ===================================================================
---- josm.orig/i18n/build.xml	2011-08-07 13:27:53.000000000 +0200
-+++ josm/i18n/build.xml	2011-08-07 23:57:23.000000000 +0200
+--- josm.orig/i18n/build.xml	2011-08-08 00:29:12.000000000 +0200
++++ josm/i18n/build.xml	2011-08-08 00:43:45.000000000 +0200
 @@ -1,7 +1,7 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project name="JOSM i18n" default="build" basedir=".">

-- 
Editor for OpenStreetMap