[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. debian/0.0.svn23479-3-10-g1370c11

[David Paleino]

The following commit has been merged in the master branch:
commit 91c25a4947e65a83c636b7b8d424e26a0ee4c9ac
Author: David Paleino <dapal at debian.org>
Date:   Mon Dec 6 11:56:26 2010 +0100

    Fix build to include imagery plugin

diff --git a/debian/changelog b/debian/changelog
index c2200ed..b0de28d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ josm-plugins (0.0.svn24572-1) UNRELEASED; urgency=low
   * Bump JOSM requirement on 3695
   * Added imagery description to josm-plugins' long description
   * Patches refreshed
+  * Fix build to include imagery plugin
 
- -- David Paleino <dapal at debian.org>  Mon, 06 Dec 2010 11:19:48 +0100
+ -- David Paleino <dapal at debian.org>  Mon, 06 Dec 2010 11:55:19 +0100
 
 josm-plugins (0.0.svn23479-3) unstable; urgency=low
 
diff --git a/debian/master.xml b/debian/master.xml
index f324bbe..ccee9d1 100644
--- a/debian/master.xml
+++ b/debian/master.xml
@@ -69,6 +69,10 @@
             <property name="plugin.jar"     value="${plugin.dist.dir}/wmsplugin.jar"/>
         </ant>
 
+        <!-- imagery must be compiled _after_ remotecontrol -->
+        <ant dir="../imagery" antfile="build.xml" target="dist">
+            <property name="plugin.jar" value="${plugin.dist.dir}/imagery.jar"/>
+        </ant>
     </target>
 
     <target name="clean">
@@ -85,6 +89,7 @@
         <ant dir="../surveyor"           antfile="build.xml" target="clean"/>
         <ant dir="../remotecontrol"      antfile="build.xml" target="clean"/>
         <ant dir="../wmsplugin"          antfile="build.xml" target="clean"/>
+        <ant dir="../imagery"            antfile="build.xml" target="clean"/>
         <delete dir="../tmp"/>
         <delete dir="${plugin.dist.dir}"/>
     </target>
diff --git a/debian/patches/180_imagery.diff b/debian/patches/180_imagery.diff
new file mode 100644
index 0000000..db45ed2
--- /dev/null
+++ b/debian/patches/180_imagery.diff
@@ -0,0 +1,38 @@
+From: David Paleino <dapal at debian.org>
+Subject: fix remotecontrol dependency, and fix build
+Forwarded: not-needed
+
+---
+ imagery/build.xml |    7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+--- josm-plugins.orig/imagery/build.xml
++++ josm-plugins/imagery/build.xml
+@@ -40,13 +40,13 @@
+       ** should not be necessary to change the following properties
+      -->
+     <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
+-    <property name="remotecontrol" location="../../dist/remotecontrol.jar" />
+     <property name="plugin.build.dir"       value="build"/>
+     <property name="plugin.src.dir"         value="src"/>
+     <!-- this is the directory where the plugin jar is copied to -->
+     <property name="plugin.dist.dir"        value="../../dist"/>
+     <property name="ant.build.javac.target" value="1.5"/>
+     <property name="plugin.dist.dir"        value="../../dist"/>
++    <property name="remotecontrol" location="${plugin.dist.dir}/remotecontrol.jar" />
+     <property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.name}.jar"/>
+ 
+     <!--
+@@ -76,11 +76,8 @@
+     ** dist - creates the plugin jar
+     **********************************************************
+     -->
+-    <target name="dist" depends="compile,revision">
++    <target name="dist" depends="compile">
+         <echo message="creating ${ant.project.name}.jar ... "/>
+-        <copy todir="${plugin.build.dir}/resources">
+-            <fileset dir="resources"/>
+-        </copy>
+         <copy todir="${plugin.build.dir}/images">
+             <fileset dir="images"/>
+         </copy>
diff --git a/debian/patches/series b/debian/patches/series
index 3b95a35..12e5c24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+180_imagery.diff
 160_remotecontrol.diff
 150_routing.diff
 140_lakewalker.diff

-- 
Plugins for josm