[Pkg-osm-commits] [SCM] josm-plugins branch, master, updated. debian/0.0.svn28008+ds1-1-9-gc229991

[David Paleino]

The following commit has been merged in the master branch:
commit a13499d891a60ea64e052dfd1d7668cc777110f1
Author: David Paleino <dapal at debian.org>
Date:   Mon Apr 23 10:19:35 2012 +0200

    Fix build-common.xml

diff --git a/debian/patches/00-fix_build-common.patch b/debian/patches/00-fix_build-common.patch
new file mode 100644
index 0000000..5d29753
--- /dev/null
+++ b/debian/patches/00-fix_build-common.patch
@@ -0,0 +1,26 @@
+From: David Paleino <dapal at debian.org>
+Subject: fix build-common.xml
+Origin: vendor
+Forwarded: no
+
+---
+ build-common.xml |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- josm-plugins.orig/build-common.xml
++++ josm-plugins/build-common.xml
+@@ -12,12 +12,12 @@
+ -->
+ <project name="plugin_common" basedir=".">
+ 
+-    <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
++    <property name="josm"                   location="/usr/share/josm/josm.jar"/>
+     <property name="plugin.build.dir"       value="build"/>
+     <property name="plugin.src.dir"         value="src"/>
+     <property name="plugin.lib.dir"         value="lib"/>
+     <!-- this is the directory where the plugin jar is copied to -->
+-    <property name="plugin.dist.dir"        value="../../dist"/>
++    <property name="plugin.dist.dir"        value="../dist"/>
+     <property name="ant.build.javac.target" value="1.5"/>
+     <property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.name}.jar"/>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index fbb989b..d5dc721 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+00-fix_build-common.patch
 150_routing.diff

-- 
Plugins for JOSM