[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. upstream/0.0.svn18009-14-gd76e942
Giovanni Mascellani
mascellani at poisson.phc.unipi.it
Sun Dec 6 21:12:01 UTC 2009
The following commit has been merged in the master branch:
commit 414e2c717ddda5f4dbf9ee9d752631e1a09477b9
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sun Dec 6 21:49:02 2009 +0100
Patch updated and added for new release
diff --git a/debian/patches/00list b/debian/patches/00list
index cef8d16..45f7328 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -8,3 +8,8 @@
80_measurement
90_openvisible
100_surveyor
+110_cadastre-fr
+120_DirectUpload
+130_editgpx
+140_lakewalker
+150_routing
diff --git a/debian/patches/10_colorscheme.dpatch b/debian/patches/10_colorscheme.dpatch
index fbf1d57..984a919 100755
--- a/debian/patches/10_colorscheme.dpatch
+++ b/debian/patches/10_colorscheme.dpatch
@@ -6,16 +6,10 @@
## DP: * Fix wrong classpath and dependencies
@DPATCH@
-diff -urNad trunk~/colorscheme/build.xml trunk/colorscheme/build.xml
---- trunk~/colorscheme/build.xml 2009-03-08 14:39:18.000000000 +0100
-+++ trunk/colorscheme/build.xml 2009-04-05 01:20:53.000000000 +0200
-@@ -8,13 +8,12 @@
- <mkdir dir="${plugin.build.dir}"/>
- </target>
- <target name="compile" depends="init">
-- <echo message="creating ${plugin.jar}"/>
- <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
- <compilerarg value="-Xlint:deprecation"/>
+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>
diff --git a/debian/patches/110_cadastre-fr.dpatch b/debian/patches/110_cadastre-fr.dpatch
new file mode 100755
index 0000000..0baf826
--- /dev/null
+++ b/debian/patches/110_cadastre-fr.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 110_cadastre-fr.dpatch by <mascellani at poisson.phc.unipi.it>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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 @@
+ <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/120_DirectUpload.dpatch b/debian/patches/120_DirectUpload.dpatch
new file mode 100755
index 0000000..eec7aed
--- /dev/null
+++ b/debian/patches/120_DirectUpload.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 120_DirectUpload.dpatch by <mascellani at poisson.phc.unipi.it>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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 --git a/debian/patches/130_editgpx.dpatch b/debian/patches/130_editgpx.dpatch
new file mode 100755
index 0000000..b9a391b
--- /dev/null
+++ b/debian/patches/130_editgpx.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 130_editgpx.dpatch by <mascellani at poisson.phc.unipi.it>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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 --git a/debian/patches/140_lakewalker.dpatch b/debian/patches/140_lakewalker.dpatch
new file mode 100755
index 0000000..c186e67
--- /dev/null
+++ b/debian/patches/140_lakewalker.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 140_lakewalker.dpatch by <mascellani at poisson.phc.unipi.it>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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 --git a/debian/patches/150_routing.dpatch b/debian/patches/150_routing.dpatch
new file mode 100755
index 0000000..ad16e67
--- /dev/null
+++ b/debian/patches/150_routing.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 150_routing.dpatch by <mascellani at poisson.phc.unipi.it>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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 21:42:54.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"/>
+ <!-- Some initializations for several other targets -->
+ <target name="init">
+@@ -25,9 +25,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"/>
--
Plugins for josm
More information about the Pkg-grass-devel
mailing list