[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. debian/0.0.svn22363-1-15-g3fb2444

[David Paleino]

The following commit has been merged in the master branch:
commit 7027225e4a0739f786ecf2b54ed17b314e78a83f
Author: David Paleino <dapal at debian.org>
Date:   Tue Sep 7 11:27:30 2010 +0200

    debian/patches/60_wmsplugin.diff: fix classpath issues with the new remotecontrol.jar

diff --git a/debian/changelog b/debian/changelog
index 46b35cf..90e88c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ josm-plugins (0.0.svn23040-1) UNRELEASED; urgency=low
     - new plugin included: remotecontrol
   * debian/patches/:
     - 150_routing.diff, 60_wmsplugin.diff refreshed to cleanly apply
+    - 60_wmsplugin.diff: fix classpath issues with the new
+      remotecontrol.jar
   * debian/control:
     - Standards-Version bumped to 3.9.1, no changes needed
     - update dependencies on JOSM
@@ -11,7 +13,7 @@ josm-plugins (0.0.svn23040-1) UNRELEASED; urgency=low
     - add remotecontrol to the list of downloded plugins
   * debian/master.xml: build remotecontrol before wmsplugin
 
- -- David Paleino <dapal at debian.org>  Tue, 07 Sep 2010 11:26:20 +0200
+ -- David Paleino <dapal at debian.org>  Tue, 07 Sep 2010 11:26:58 +0200
 
 josm-plugins (0.0.svn22363-1) unstable; urgency=low
 
diff --git a/debian/patches/60_wmsplugin.diff b/debian/patches/60_wmsplugin.diff
index 8b74e82..275e9d6 100644
--- a/debian/patches/60_wmsplugin.diff
+++ b/debian/patches/60_wmsplugin.diff
@@ -1,11 +1,23 @@
 Patch for plugin wmsplugin
  * Disable upstream SVN access
+ * Fix classpath issues with remotecontrol.jar
 ---
- wmsplugin/build.xml |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ wmsplugin/build.xml |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 --- josm-plugins.orig/wmsplugin/build.xml
 +++ josm-plugins/wmsplugin/build.xml
+@@ -32,9 +32,9 @@
+ 
+ 
+ 	<property name="josm" location="../../core/dist/josm-custom.jar" />
+-	<property name="remotecontrol" location="../../dist/remotecontrol.jar" />
+ 	<property name="plugin.dist.dir" value="../../dist" />
+ 	<property name="plugin.build.dir" value="build" />
++	<property name="remotecontrol" location="${plugin.dist.dir}/remotecontrol.jar" />
+ 	<property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar" />
+ 	<property name="ant.build.javac.target" value="1.5" />
+ 
 @@ -48,7 +48,7 @@
  			<compilerarg value="-Xlint:unchecked" />
  		</javac>

-- 
Plugins for josm