[Pkg-osm-commits] [SCM] josm-plugins branch, master, updated. debian/0.0.svn28784+ds1-1-18-g78b536c

[David Paleino]

The following commit has been merged in the master branch:
commit b0692afa6df81fddb95e728657ef2e68df0cb668
Author: David Paleino <dapal at debian.org>
Date:   Tue Nov 13 20:05:50 2012 +0100

    Disabled livegps and surveyour plugin.

diff --git a/debian/changelog b/debian/changelog
index 60f714d..7dfe99c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm-plugins (0.0.svn28784+ds1-2) UNRELEASED; urgency=low
+
+  * Disabled livegps and surveyour plugin.
+
+ -- David Paleino <dapal at debian.org>  Tue, 13 Nov 2012 20:05:30 +0100
+
 josm-plugins (0.0.svn28784+ds1-1) unstable; urgency=low
 
   [ Giovanni Mascellani ]
diff --git a/debian/master.xml b/debian/master.xml
index 2ada87c..f99d2a5 100644
--- a/debian/master.xml
+++ b/debian/master.xml
@@ -47,10 +47,6 @@
       </antcall>
 
       <antcall target="do_plugin">
-	<param name="plugin.name" value="livegps"/>
-      </antcall>
-
-      <antcall target="do_plugin">
 	<param name="plugin.name" value="measurement"/>
       </antcall>
 
@@ -62,11 +58,6 @@
 	<param name="plugin.name" value="routing"/>
       </antcall>
 
-        <!-- surveyor must be compiled _after_ livegps -->
-      <antcall target="do_plugin">
-	<param name="plugin.name" value="surveyor"/>
-      </antcall>
-
     </target>
 
     <target name="clean">
@@ -75,11 +66,9 @@
         <ant dir="../DirectUpload"       antfile="build.xml" target="clean"/>
         <ant dir="../editgpx"            antfile="build.xml" target="clean"/>
         <ant dir="../lakewalker"         antfile="build.xml" target="clean"/>
-        <ant dir="../livegps"            antfile="build.xml" target="clean"/>
         <ant dir="../measurement"        antfile="build.xml" target="clean"/>
         <ant dir="../openvisible"        antfile="build.xml" target="clean"/>
         <ant dir="../routing"            antfile="build.xml" target="clean"/>
-        <ant dir="../surveyor"           antfile="build.xml" target="clean"/>
         <delete dir="../tmp"/>
         <delete dir="${plugin.dist.dir}"/>
     </target>
diff --git a/debian/rules b/debian/rules
index 18a7b44..4939dae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 export CLASSPATH=/usr/share/josm/josm.jar:/usr/share/java/metadata-extractor.jar
 
 SVNREPO := http://svn.openstreetmap.org/applications/editors/josm/plugins/
-PLUGINS := cadastre-fr colorscheme DirectUpload editgpx lakewalker livegps measurement openvisible routing surveyor
+PLUGINS := cadastre-fr colorscheme DirectUpload editgpx lakewalker measurement openvisible routing
 
 DATE := $(shell date +%Y%m%d)
 ifdef SVNREV

-- 
Plugins for JOSM