The following commit has been merged in the master branch:
commit decc4ee8a0ae6cfcf0b7c08cc4bdc269ccabb2d2
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date:   Tue Mar 30 10:47:23 2010 +0200

    Dpatches updated against new upstream version

diff --git a/debian/patches/00list b/debian/patches/00list
index 45f7328..25902b9 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,10 +1,7 @@
 10_colorscheme
 20_livegps
 30_slippymap
-40_utilsplugin
-50_validator
 60_wmsplugin
-70_agpifoj
 80_measurement
 90_openvisible
 100_surveyor
diff --git a/debian/patches/100_surveyor.dpatch 
b/debian/patches/100_surveyor.dpatch
index 3f03e52..2c7087f 100755
--- a/debian/patches/100_surveyor.dpatch
+++ b/debian/patches/100_surveyor.dpatch
@@ -6,15 +6,15 @@
 ## DP:  * Backport recent code
 
 @DPATCH@
-diff -urNad trunk~/surveyor/build.xml trunk/surveyor/build.xml
---- trunk~/surveyor/build.xml  2009-08-30 18:28:38.000000000 +0200
-+++ trunk/surveyor/build.xml   2009-09-14 16:09:57.000000000 +0200
-@@ -19,7 +19,7 @@
-             </classpath>
-         </javac>
-     </target>
--    <target name="dist" depends="compile,revision">
-+    <target name="dist" depends="compile">
-         <copy todir="${plugin.build.dir}/">
-             <fileset dir="resources">
-                 <include name="*.xml"/>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
josm-plugins~/surveyor/build.xml josm-plugins/surveyor/build.xml
+--- josm-plugins~/surveyor/build.xml   2010-03-30 00:03:05.000000000 +0200
++++ josm-plugins/surveyor/build.xml    2010-03-30 10:53:58.000000000 +0200
+@@ -55,7 +55,7 @@
+                       </classpath>
+               </javac>
+       </target>
+-      <target name="dist" depends="compile,revision">
++      <target name="dist" depends="compile">
+               <copy todir="${plugin.build.dir}/">
+                       <fileset dir="resources">
+                               <include name="*.xml"/>
diff --git a/debian/patches/10_colorscheme.dpatch 
b/debian/patches/10_colorscheme.dpatch
index 984a919..ca92c86 100755
--- a/debian/patches/10_colorscheme.dpatch
+++ b/debian/patches/10_colorscheme.dpatch
@@ -6,15 +6,15 @@
 ## DP:  * Fix wrong classpath and dependencies
 
 @DPATCH@
-diff -urNad josm-plugins~/colorscheme/build.xml 
josm-plugins/colorscheme/build.xml
---- josm-plugins~/colorscheme/build.xml        2009-07-08 16:40:06.000000000 
+0200
-+++ josm-plugins/colorscheme/build.xml 2009-12-06 21:46:05.000000000 +0100
-@@ -14,7 +14,7 @@
-             <compilerarg value="-Xlint:unchecked"/>
-         </javac>
-     </target>
--    <target name="dist" depends="compile,revision">
-+    <target name="dist" depends="compile">
-         <copy todir="${plugin.build.dir}">
-             <fileset dir="src">
-                 <include name="*.xml"/>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
josm-plugins~/colorscheme/build.xml josm-plugins/colorscheme/build.xml
+--- josm-plugins~/colorscheme/build.xml        2010-03-30 00:03:05.000000000 
+0200
++++ josm-plugins/colorscheme/build.xml 2010-03-30 10:46:33.000000000 +0200
+@@ -45,7 +45,7 @@
+                       <compilerarg value="-Xlint:unchecked"/>
+               </javac>
+       </target>
+-      <target name="dist" depends="compile,revision">
++      <target name="dist" depends="compile">
+               <copy todir="${plugin.build.dir}">
+                       <fileset dir="src">
+                               <include name="*.xml"/>
diff --git a/debian/patches/110_cadastre-fr.dpatch 
b/debian/patches/110_cadastre-fr.dpatch
index 0baf826..84cfbc1 100755
--- a/debian/patches/110_cadastre-fr.dpatch
+++ b/debian/patches/110_cadastre-fr.dpatch
@@ -5,10 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad josm-plugins~/cadastre-fr/build.xml 
josm-plugins/cadastre-fr/build.xml
---- josm-plugins~/cadastre-fr/build.xml        2009-12-05 01:01:22.000000000 
+0100
-+++ josm-plugins/cadastre-fr/build.xml 2009-12-06 21:33:05.000000000 +0100
-@@ -14,7 +14,7 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
josm-plugins~/cadastre-fr/build.xml josm-plugins/cadastre-fr/build.xml
+--- josm-plugins~/cadastre-fr/build.xml        2010-03-30 00:03:05.000000000 
+0200
++++ josm-plugins/cadastre-fr/build.xml 2010-03-30 10:54:14.000000000 +0200
+@@ -45,7 +45,7 @@
              <compilerarg value="-Xlint:unchecked"/>
          </javac>
      </target>
diff --git a/debian/patches/120_DirectUpload.dpatch 
b/debian/patches/120_DirectUpload.dpatch
index eec7aed..9251b66 100755
--- a/debian/patches/120_DirectUpload.dpatch
+++ b/debian/patches/120_DirectUpload.dpatch
@@ -5,15 +5,15 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad josm-plugins~/DirectUpload/build.xml 
josm-plugins/DirectUpload/build.xml
---- josm-plugins~/DirectUpload/build.xml       2009-12-05 01:01:22.000000000 
+0100
-+++ josm-plugins/DirectUpload/build.xml        2009-12-06 21:33:54.000000000 
+0100
-@@ -14,7 +14,7 @@
-             <compilerarg value="-Xlint:unchecked"/>
-         </javac>
-     </target>
--    <target name="dist" depends="compile,revision">
-+    <target name="dist" depends="compile">
-         <copy todir="${plugin.build.dir}/images">
-             <fileset dir="images"/>
-         </copy>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
josm-plugins~/DirectUpload/build.xml josm-plugins/DirectUpload/build.xml
+--- josm-plugins~/DirectUpload/build.xml       2010-03-30 00:03:05.000000000 
+0200
++++ josm-plugins/DirectUpload/build.xml        2010-03-30 10:55:01.000000000 
+0200
+@@ -44,7 +44,7 @@
+                       <compilerarg value="-Xlint:unchecked"/>
+               </javac>
+       </target>
+-      <target name="dist" depends="compile,revision">
++      <target name="dist" depends="compile">
+               <copy todir="${plugin.build.dir}/images">
+                       <fileset dir="images"/>
+               </copy>
diff --git a/debian/patches/130_editgpx.dpatch 
b/debian/patches/130_editgpx.dpatch
index b9a391b..daf58a8 100755
--- a/debian/patches/130_editgpx.dpatch
+++ b/debian/patches/130_editgpx.dpatch
@@ -5,15 +5,15 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad josm-plugins~/editgpx/build.xml josm-plugins/editgpx/build.xml
---- josm-plugins~/editgpx/build.xml    2009-12-05 01:01:22.000000000 +0100
-+++ josm-plugins/editgpx/build.xml     2009-12-06 21:34:44.000000000 +0100
-@@ -14,7 +14,7 @@
-             <compilerarg value="-Xlint:unchecked"/>
-         </javac>
-     </target>
--    <target name="dist" depends="compile,revision">
-+    <target name="dist" depends="compile">
-         <copy todir="${plugin.build.dir}/images">
-             <fileset dir="images"/>
-         </copy>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
josm-plugins~/editgpx/build.xml josm-plugins/editgpx/build.xml
+--- josm-plugins~/editgpx/build.xml    2010-03-30 00:03:05.000000000 +0200
++++ josm-plugins/editgpx/build.xml     2010-03-30 10:55:43.000000000 +0200
+@@ -46,7 +46,7 @@
+                       <compilerarg value="-Xlint:unchecked"/>
+               </javac>
+       </target>
+-      <target name="dist" depends="compile,revision">
++      <target name="dist" depends="compile">
+               <copy todir="${plugin.build.dir}/images">
+                       <fileset dir="images"/>
+               </copy>
diff --git a/debian/patches/140_lakewalker.dpatch 
b/debian/patches/140_lakewalker.dpatch
index c186e67..af45832 100755
--- a/debian/patches/140_lakewalker.dpatch
+++ b/debian/patches/140_lakewalker.dpatch
@@ -5,15 +5,15 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad josm-plugins~/lakewalker/build.xml 
josm-plugins/lakewalker/build.xml
---- josm-plugins~/lakewalker/build.xml 2009-12-05 01:01:22.000000000 +0100
-+++ josm-plugins/lakewalker/build.xml  2009-12-06 21:36:09.000000000 +0100
-@@ -14,7 +14,7 @@
-             <compilerarg value="-Xlint:unchecked"/>
-         </javac>
-     </target>
--    <target name="dist" depends="compile,revision">
-+    <target name="dist" depends="compile">
-         <copy todir="${plugin.build.dir}/images">
-             <fileset dir="images"/>
-         </copy>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
josm-plugins~/lakewalker/build.xml josm-plugins/lakewalker/build.xml
+--- josm-plugins~/lakewalker/build.xml 2010-03-30 00:03:05.000000000 +0200
++++ josm-plugins/lakewalker/build.xml  2010-03-30 10:56:15.000000000 +0200
+@@ -44,7 +44,7 @@
+                       <compilerarg value="-Xlint:unchecked"/>
+               </javac>
+       </target>
+-      <target name="dist" depends="compile,revision">
++      <target name="dist" depends="compile">
+               <copy todir="${plugin.build.dir}/images">
+                       <fileset dir="images"/>
+               </copy>
diff --git a/debian/patches/150_routing.dpatch 
b/debian/patches/150_routing.dpatch
index 80eb74a..dcde2d5 100755
--- a/debian/patches/150_routing.dpatch
+++ b/debian/patches/150_routing.dpatch
@@ -5,36 +5,36 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad josm-plugins~/routing/build.xml josm-plugins/routing/build.xml
---- josm-plugins~/routing/build.xml    2009-12-05 01:01:22.000000000 +0100
-+++ josm-plugins/routing/build.xml     2009-12-06 22:20:03.000000000 +0100
-@@ -4,8 +4,8 @@
-     <property name="plugin.dist.dir"        value="../../dist"/>
-     <property name="plugin.build.dir"       value="build"/>
-     <property name="plugin.jar"             
value="${plugin.dist.dir}/${ant.project.name}.jar"/>
--    <property name="jgrapht"                value="lib/jgrapht-jdk1.5.jar"/>
--    <property name="log4j"                  value="lib/log4j-1.2.15.jar"/>
-+    <property name="jgrapht"                
value="/usr/share/java/jgrapht.jar"/>
-+    <property name="log4j"                  
value="/usr/share/java/log4j-1.2.jar"/>
-     <property name="ant.build.javac.target" value="1.5"/>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
josm-plugins~/routing/build.xml josm-plugins/routing/build.xml
+--- josm-plugins~/routing/build.xml    2010-03-30 00:03:05.000000000 +0200
++++ josm-plugins/routing/build.xml     2010-03-30 10:58:14.000000000 +0200
+@@ -34,8 +34,8 @@
+       <property name="plugin.dist.dir"        value="../../dist"/>
+       <property name="plugin.build.dir"       value="build"/>
+       <property name="plugin.jar"             
value="${plugin.dist.dir}/${ant.project.name}.jar"/>
+-      <property name="jgrapht"                value="lib/jgrapht-jdk1.5.jar"/>
+-      <property name="log4j"                  value="lib/log4j-1.2.15.jar"/>
++      <property name="jgrapht"                
value="/usr/share/java/jgrapht.jar"/>
++      <property name="log4j"                  
value="/usr/share/java/log4j-1.2.jar"/>
+       <property name="ant.build.javac.target" value="1.5"/>
        <!-- Some initializations for several other targets -->
-     <target name="init">
-@@ -25,9 +25,7 @@
-         </javac>
-     </target>
+       <target name="init">
+@@ -55,9 +55,7 @@
+               </javac>
+       </target>
        <!-- Generate distribution -->
--    <target name="dist" depends="compile,revision" description="Generate 
distribution">
--        <unjar dest="${plugin.build.dir}" src="${jgrapht}"/>
--        <unjar dest="${plugin.build.dir}" src="${log4j}"/>
-+    <target name="dist" depends="compile" description="Generate distribution">
-         <copy todir="${plugin.build.dir}/">
-             <fileset dir="resources">
-                 <include name="*.xml"/>
-@@ -46,6 +44,7 @@
-                 <attribute name="Plugin-Mainversion" value="2450"/>
-                 <attribute name="Plugin-Stage" value="50"/>
-                 <attribute name="Plugin-Version" 
value="${version.entry.commit.revision}"/>
-+                <attribute name="Class-Path" value="${jgrapht} ${log4j}"/>
-             </manifest>
-         </jar>
-     </target>
+-      <target name="dist" depends="compile,revision" description="Generate 
distribution">
+-              <unjar dest="${plugin.build.dir}" src="${jgrapht}"/>
+-              <unjar dest="${plugin.build.dir}" src="${log4j}"/>
++      <target name="dist" depends="compile" description="Generate 
distribution">
+               <copy todir="${plugin.build.dir}/">
+                       <fileset dir="resources">
+                               <include name="*.xml"/>
+@@ -76,6 +74,7 @@
+                               <attribute name="Plugin-Mainversion" 
value="${plugin.main.version}"/>
+                               <attribute name="Plugin-Stage" value="50"/>
+                               <attribute name="Plugin-Version" 
value="${version.entry.commit.revision}"/>
++                              <attribute name="Class-Path" value="${jgrapht} 
${log4j}"/>
+                       </manifest>
+               </jar>
+       </target>
diff --git a/debian/patches/20_livegps.dpatch b/debian/patches/20_livegps.dpatch
index d2c9383..bd74a51 100755
--- a/debian/patches/20_livegps.dpatch
+++ b/debian/patches/20_livegps.dpatch
@@ -6,15 +6,15 @@
 ## DP:  * Fix wrong classpath
 
 @DPATCH@
-diff -urNad trunk~/livegps/build.xml trunk/livegps/build.xml
---- trunk~/livegps/build.xml   2009-03-18 15:55:16.000000000 +0100
-+++ trunk/livegps/build.xml    2009-04-05 01:21:45.000000000 +0200
-@@ -14,7 +14,7 @@
-             <compilerarg value="-Xlint:unchecked"/>
-         </javac>
-     </target>
--    <target name="dist" depends="compile,revision">
-+    <target name="dist" depends="compile">
-         <copy todir="${plugin.build.dir}/images">
-             <fileset dir="images"/>
-         </copy>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
josm-plugins~/livegps/build.xml josm-plugins/livegps/build.xml
+--- josm-plugins~/livegps/build.xml    2010-03-30 00:03:05.000000000 +0200
++++ josm-plugins/livegps/build.xml     2010-03-30 10:48:19.000000000 +0200
+@@ -45,7 +45,7 @@
+                       <compilerarg value="-Xlint:unchecked"/>
+               </javac>
+       </target>
+-      <target name="dist" depends="compile,revision">
++      <target name="dist" depends="compile">
+               <copy todir="${plugin.build.dir}/images">
+                       <fileset dir="images"/>
+               </copy>
diff --git a/debian/patches/30_slippymap.dpatch 
b/debian/patches/30_slippymap.dpatch
index 93e5499..3b2585f 100755
--- a/debian/patches/30_slippymap.dpatch
+++ b/debian/patches/30_slippymap.dpatch
@@ -6,15 +6,15 @@
 ## DP:  * Fix wrong classpath
 
 @DPATCH@
-diff -urNad trunk~/slippymap/build.xml trunk/slippymap/build.xml
---- trunk~/slippymap/build.xml 2009-03-08 14:39:18.000000000 +0100
-+++ trunk/slippymap/build.xml  2009-04-05 01:22:45.000000000 +0200
-@@ -14,7 +14,7 @@
-             <compilerarg value="-Xlint:unchecked"/>
-         </javac>
-     </target>
--    <target name="dist" depends="compile,revision">
-+    <target name="dist" depends="compile">
-         <copy todir="${plugin.build.dir}/images">
-             <fileset dir="images"/>
-         </copy>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
josm-plugins~/slippymap/build.xml josm-plugins/slippymap/build.xml
+--- josm-plugins~/slippymap/build.xml  2010-03-30 00:03:05.000000000 +0200
++++ josm-plugins/slippymap/build.xml   2010-03-30 10:49:31.000000000 +0200
+@@ -44,7 +44,7 @@
+                       <compilerarg value="-Xlint:unchecked"/>
+               </javac>
+       </target>
+-      <target name="dist" depends="compile,revision">
++      <target name="dist" depends="compile">
+               <copy todir="${plugin.build.dir}/images">
+                       <fileset dir="images"/>
+               </copy>
diff --git a/debian/patches/40_utilsplugin.dpatch 
b/debian/patches/40_utilsplugin.dpatch
deleted file mode 100755
index 287c4ec..0000000
--- a/debian/patches/40_utilsplugin.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_utilsplugin.dpatch by  <g.mascell...@gmail.com>
-##
-## DP: Patch for plugin utilsplugin
-## DP:  * Disable upstream SVN access
-
-...@dpatch@
-diff -urNad trunk~/utilsplugin/build.xml trunk/utilsplugin/build.xml
---- trunk~/utilsplugin/build.xml       2009-03-08 14:39:18.000000000 +0100
-+++ trunk/utilsplugin/build.xml        2009-04-05 01:23:57.000000000 +0200
-@@ -14,7 +14,7 @@
-             <compilerarg value="-Xlint:unchecked"/>
-         </javac>
-     </target>
--    <target name="dist" depends="compile,revision">
-+    <target name="dist" depends="compile">
-         <copy todir="${plugin.build.dir}/images">
-             <fileset dir="images"/>
-         </copy>
diff --git a/debian/patches/50_validator.dpatch 
b/debian/patches/50_validator.dpatch
deleted file mode 100755
index 43376ac..0000000
--- a/debian/patches/50_validator.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_validator.dpatch by  <g.mascell...@gmail.com>
-##
-## DP: Patch for plugin validator
-## DP:  * Disable upstream SVN access
-
-...@dpatch@
-diff -urNad trunk~/validator/build.xml trunk/validator/build.xml
---- trunk~/validator/build.xml 2009-03-08 14:39:18.000000000 +0100
-+++ trunk/validator/build.xml  2009-06-07 15:38:06.000000000 +0200
-@@ -14,7 +14,7 @@
-             <compilerarg value="-Xlint:unchecked"/>
-         </javac>
-     </target>
--    <target name="dist" depends="compile,revision">
-+    <target name="dist" depends="compile">
-         <copy todir="${plugin.build.dir}/images">
-             <fileset dir="images"/>
-         </copy>
diff --git a/debian/patches/60_wmsplugin.dpatch 
b/debian/patches/60_wmsplugin.dpatch
index c7fd74e..0527ec4 100755
--- a/debian/patches/60_wmsplugin.dpatch
+++ b/debian/patches/60_wmsplugin.dpatch
@@ -5,15 +5,15 @@
 ## DP:  * Disable upstream SVN access
 
 @DPATCH@
-diff -urNad trunk~/wmsplugin/build.xml trunk/wmsplugin/build.xml
---- trunk~/wmsplugin/build.xml 2009-09-09 00:30:10.000000000 +0200
-+++ trunk/wmsplugin/build.xml  2009-09-14 16:09:32.000000000 +0200
-@@ -43,7 +43,7 @@
-             <compilerarg value="-Xlint:unchecked"/>
-         </javac>
-     </target>
--    <target name="dist" depends="compile,revision">
-+    <target name="dist" depends="compile">
-       <echo message="building ${plugin.jar} with version 
${version.entry.commit.revision} for JOSM version ${josm.reference.release} "/>
-         <copy todir="${plugin.build.dir}/images">
-             <fileset dir="images"/>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
josm-plugins~/wmsplugin/build.xml josm-plugins/wmsplugin/build.xml
+--- josm-plugins~/wmsplugin/build.xml  2010-03-30 00:03:05.000000000 +0200
++++ josm-plugins/wmsplugin/build.xml   2010-03-30 10:52:11.000000000 +0200
+@@ -47,7 +47,7 @@
+                       <compilerarg value="-Xlint:unchecked" />
+               </javac>
+       </target>
+-      <target name="dist" depends="compile,revision">
++      <target name="dist" depends="compile">
+               <echo message="building ${plugin.jar} with version 
${version.entry.commit.revision} for JOSM version ${josm.reference.release} " />
+               <copy todir="${plugin.build.dir}/images">
+                       <fileset dir="images" />
diff --git a/debian/patches/70_agpifoj.dpatch b/debian/patches/70_agpifoj.dpatch
deleted file mode 100755
index 34a197e..0000000
--- a/debian/patches/70_agpifoj.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 70_agpifoj.dpatch by  <g.mascell...@gmail.com>
-##
-## DP: Patch for plugin agpifoj
-## DP:  * Disable upstream SVN access
-## DP:  * Fix wrong classpath
-
-...@dpatch@
-diff -urNad trunk~/agpifoj/build.xml trunk/agpifoj/build.xml
---- trunk~/agpifoj/build.xml   2009-03-08 15:23:45.000000000 +0100
-+++ trunk/agpifoj/build.xml    2009-04-05 01:26:35.000000000 +0200
-@@ -14,7 +14,7 @@
-             <compilerarg value="-Xlint:unchecked"/>
-         </javac>
-     </target>
--    <target name="dist" depends="compile,revision">
-+    <target name="dist" depends="compile">
-         <copy todir="${plugin.build.dir}">
-             <fileset dir=".">
-                 <include name="CHANGELOG"/>
diff --git a/debian/patches/80_measurement.dpatch 
b/debian/patches/80_measurement.dpatch
index b50e355..2bbba0f 100755
--- a/debian/patches/80_measurement.dpatch
+++ b/debian/patches/80_measurement.dpatch
@@ -5,15 +5,15 @@
 ## DP:  * Disable upstream SVN access
 
 @DPATCH@
-diff -urNad trunk~/measurement/build.xml trunk/measurement/build.xml
---- trunk~/measurement/build.xml       2009-03-08 14:39:18.000000000 +0100
-+++ trunk/measurement/build.xml        2009-04-05 01:27:24.000000000 +0200
-@@ -14,7 +14,7 @@
-             <compilerarg value="-Xlint:unchecked"/>
-         </javac>
-     </target>
--    <target name="dist" depends="compile,revision">
-+    <target name="dist" depends="compile">
-         <copy todir="${plugin.build.dir}/images">
-             <fileset dir="images"/>
-         </copy>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
josm-plugins~/measurement/build.xml josm-plugins/measurement/build.xml
+--- josm-plugins~/measurement/build.xml        2010-03-30 00:03:05.000000000 
+0200
++++ josm-plugins/measurement/build.xml 2010-03-30 10:53:00.000000000 +0200
+@@ -45,7 +45,7 @@
+                       <compilerarg value="-Xlint:unchecked"/>
+               </javac>
+       </target>
+-      <target name="dist" depends="compile,revision">
++      <target name="dist" depends="compile">
+               <copy todir="${plugin.build.dir}/images">
+                       <fileset dir="images"/>
+               </copy>
diff --git a/debian/patches/90_openvisible.dpatch 
b/debian/patches/90_openvisible.dpatch
index 51ac1c5..8db9c5a 100755
--- a/debian/patches/90_openvisible.dpatch
+++ b/debian/patches/90_openvisible.dpatch
@@ -6,15 +6,15 @@
 ## DP:  * Fix wrong classpath, dependencies and filepath
 
 @DPATCH@
-diff -urNad trunk~/openvisible/build.xml trunk/openvisible/build.xml
---- trunk~/openvisible/build.xml       2009-03-08 14:39:18.000000000 +0100
-+++ trunk/openvisible/build.xml        2009-04-05 01:28:02.000000000 +0200
-@@ -14,7 +14,7 @@
-             <compilerarg value="-Xlint:unchecked"/>
-         </javac>
-     </target>
--    <target name="dist" depends="compile,revision">
-+    <target name="dist" depends="compile">
-         <copy todir="${plugin.build.dir}/images">
-             <fileset dir="images"/>
-         </copy>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
josm-plugins~/openvisible/build.xml josm-plugins/openvisible/build.xml
+--- josm-plugins~/openvisible/build.xml        2010-03-30 00:03:05.000000000 
+0200
++++ josm-plugins/openvisible/build.xml 2010-03-30 10:53:28.000000000 +0200
+@@ -49,7 +49,7 @@
+                       <compilerarg value="-Xlint:unchecked"/>
+               </javac>
+       </target>
+-      <target name="dist" depends="compile,revision">
++      <target name="dist" depends="compile">
+               <copy todir="${plugin.build.dir}/images">
+                       <fileset dir="images"/>
+               </copy>

-- 
Plugins for josm

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to