Author: gmascellani-guest
Date: 2009-04-04 23:30:56 +0000 (Sat, 04 Apr 2009)
New Revision: 2133
Modified:
packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch
packages/josm-plugins/trunk/debian/patches/20_livegps.dpatch
packages/josm-plugins/trunk/debian/patches/30_slippymap.dpatch
packages/josm-plugins/trunk/debian/patches/40_utilsplugin.dpatch
packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch
packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch
packages/josm-plugins/trunk/debian/patches/80_measurement.dpatch
packages/josm-plugins/trunk/debian/patches/90_openvisible.dpatch
Log:
Patches updated to last revision
Modified: packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
2009-04-04 23:14:36 UTC (rev 2132)
+++ packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
2009-04-04 23:30:56 UTC (rev 2133)
@@ -6,20 +6,14 @@
@DPATCH@
diff -urNad trunk~/surveyor/build.xml trunk/surveyor/build.xml
---- trunk~/surveyor/build.xml 2009-01-23 22:36:04.000000000 +0100
-+++ trunk/surveyor/build.xml 2009-02-16 11:06:30.000000000 +0100
-@@ -20,14 +20,6 @@
+--- trunk~/surveyor/build.xml 2009-03-08 14:39:18.000000000 +0100
++++ trunk/surveyor/build.xml 2009-04-05 01:29:11.000000000 +0200
+@@ -19,7 +19,7 @@
+ </classpath>
</javac>
</target>
- <target name="dist" depends="compile">
-- <exec append="false" output="REVISION" executable="svn"
failifexecutionfails="false">
-- <env key="LANG" value="C"/>
-- <arg value="info"/>
-- <arg value="--xml"/>
-- <arg value="."/>
-- </exec>
-- <xmlproperty file="REVISION" prefix="version" keepRoot="false"
collapseAttributes="true"/>
-- <delete file="REVISION"/>
+- <target name="dist" depends="compile,revision">
++ <target name="dist" depends="compile">
<copy todir="${plugin.build.dir}/">
<fileset dir="resources">
<include name="*.xml"/>
Modified: packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch
2009-04-04 23:14:36 UTC (rev 2132)
+++ packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch
2009-04-04 23:30:56 UTC (rev 2133)
@@ -6,3 +6,21 @@
## 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"/>
+ <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"/>
Modified: packages/josm-plugins/trunk/debian/patches/20_livegps.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/20_livegps.dpatch
2009-04-04 23:14:36 UTC (rev 2132)
+++ packages/josm-plugins/trunk/debian/patches/20_livegps.dpatch
2009-04-04 23:30:56 UTC (rev 2133)
@@ -7,34 +7,14 @@
@DPATCH@
diff -urNad trunk~/livegps/build.xml trunk/livegps/build.xml
---- trunk~/livegps/build.xml 2009-01-01 18:55:45.000000000 +0100
-+++ trunk/livegps/build.xml 2009-02-15 19:58:35.000000000 +0100
-@@ -35,14 +35,6 @@
- <copy todir="${plugin.build.dir}/images">
- <fileset dir="images" />
- </copy>
-- <exec append="false" output="REVISION" executable="svn"
failifexecutionfails="false">
-- <env key="LANG" value="C"/>
-- <arg value="info"/>
-- <arg value="--xml"/>
-- <arg value="."/>
-- </exec>
-- <xmlproperty file="REVISION" prefix="version" keepRoot="false"
collapseAttributes="true"/>
-- <delete file="REVISION"/>
- <!-- create jar file -->
- <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
- <manifest>
-@@ -60,12 +52,7 @@
- <javac srcdir="livegps" destdir="${plugin.build.dir}" debug="true"
source="1.5" target="1.5">
- <compilerarg value="-Xlint:deprecation"/>
- <classpath>
-- <pathelement path="${josm.build.dir}/build"/>
-- <fileset dir="${josm.build.dir}/lib">
-- <include name="../core/build/josm.jar"/>
-- <include name="**/*.jar"/>
-- </fileset>
-- <pathelement location="${plugin.jar}"/>
-+ <pathelement location="${josm}"/>
- </classpath>
+--- 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>
Modified: packages/josm-plugins/trunk/debian/patches/30_slippymap.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/30_slippymap.dpatch
2009-04-04 23:14:36 UTC (rev 2132)
+++ packages/josm-plugins/trunk/debian/patches/30_slippymap.dpatch
2009-04-04 23:30:56 UTC (rev 2133)
@@ -7,29 +7,14 @@
@DPATCH@
diff -urNad trunk~/slippymap/build.xml trunk/slippymap/build.xml
---- trunk~/slippymap/build.xml 2009-01-01 18:55:45.000000000 +0100
-+++ trunk/slippymap/build.xml 2009-02-15 19:59:59.000000000 +0100
-@@ -20,14 +20,6 @@
- <copy todir="build/images">
- <fileset dir="images" />
- </copy>
-- <exec append="false" output="REVISION" executable="svn"
failifexecutionfails="false">
-- <env key="LANG" value="C"/>
-- <arg value="info"/>
-- <arg value="--xml"/>
-- <arg value="."/>
-- </exec>
-- <xmlproperty file="REVISION" prefix="version" keepRoot="false"
collapseAttributes="true"/>
-- <delete file="REVISION"/>
- <!-- create josm-custom.jar -->
- <jar destfile="${plugin.jar}" basedir="build">
- <manifest>
-@@ -41,7 +33,7 @@
- </target>
- <target name="compile" depends="init">
- <echo message="creating ${plugin.jar}"/>
-- <javac srcdir="src" classpath="../../core/dist/josm-custom.jar"
destdir="build">
-+ <javac srcdir="src" classpath="${josm}" destdir="build">
- <compilerarg value="-Xlint:deprecation"/>
+--- 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>
Modified: packages/josm-plugins/trunk/debian/patches/40_utilsplugin.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/40_utilsplugin.dpatch
2009-04-04 23:14:36 UTC (rev 2132)
+++ packages/josm-plugins/trunk/debian/patches/40_utilsplugin.dpatch
2009-04-04 23:30:56 UTC (rev 2133)
@@ -6,20 +6,14 @@
@DPATCH@
diff -urNad trunk~/utilsplugin/build.xml trunk/utilsplugin/build.xml
---- trunk~/utilsplugin/build.xml 2009-02-14 13:34:22.000000000 +0100
-+++ trunk/utilsplugin/build.xml 2009-02-15 20:01:14.000000000 +0100
-@@ -18,14 +18,6 @@
+--- 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>
-- <exec append="false" output="REVISION" executable="svn"
failifexecutionfails="false">
-- <env key="LANG" value="C"/>
-- <arg value="info"/>
-- <arg value="--xml"/>
-- <arg value="."/>
-- </exec>
-- <xmlproperty file="REVISION" prefix="version" keepRoot="false"
collapseAttributes="true"/>
-- <delete file="REVISION"/>
- <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
- <manifest>
- <attribute name="Plugin-Class"
value="UtilsPlugin.UtilsPlugin"/>
Modified: packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
2009-04-04 23:14:36 UTC (rev 2132)
+++ packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
2009-04-04 23:30:56 UTC (rev 2133)
@@ -6,20 +6,14 @@
@DPATCH@
diff -urNad trunk~/validator/build.xml trunk/validator/build.xml
---- trunk~/validator/build.xml 2009-01-23 22:36:04.000000000 +0100
-+++ trunk/validator/build.xml 2009-02-15 20:02:13.000000000 +0100
-@@ -19,14 +19,6 @@
+--- trunk~/validator/build.xml 2009-03-08 14:39:18.000000000 +0100
++++ trunk/validator/build.xml 2009-04-05 01:24:52.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>
-- <exec append="false" output="REVISION" executable="svn"
failifexecutionfails="false">
-- <env key="LANG" value="C"/>
-- <arg value="info"/>
-- <arg value="--xml"/>
-- <arg value="."/>
-- </exec>
-- <xmlproperty file="REVISION" prefix="version" keepRoot="false"
collapseAttributes="true"/>
-- <delete file="REVISION"/>
- <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
- <manifest>
- <attribute name="Plugin-Class"
value="org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin"/>
Modified: packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch
2009-04-04 23:14:36 UTC (rev 2132)
+++ packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch
2009-04-04 23:30:56 UTC (rev 2133)
@@ -6,20 +6,14 @@
@DPATCH@
diff -urNad trunk~/wmsplugin/build.xml trunk/wmsplugin/build.xml
---- trunk~/wmsplugin/build.xml 2009-02-08 11:38:00.000000000 +0100
-+++ trunk/wmsplugin/build.xml 2009-02-15 20:04:02.000000000 +0100
-@@ -22,14 +22,6 @@
- <copy todir="${plugin.build.dir}/images" >
- <fileset dir="images" />
+--- trunk~/wmsplugin/build.xml 2009-03-18 15:55:16.000000000 +0100
++++ trunk/wmsplugin/build.xml 2009-04-05 01:25:39.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}/resources">
+ <fileset dir="resources"/>
</copy>
-- <exec append="false" output="REVISION" executable="svn"
failifexecutionfails="false">
-- <env key="LANG" value="C"/>
-- <arg value="info"/>
-- <arg value="--xml"/>
-- <arg value="."/>
-- </exec>
-- <xmlproperty file="REVISION" prefix="version" keepRoot="false"
collapseAttributes="true"/>
-- <delete file="REVISION"/>
- <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
- <manifest>
- <attribute name="Plugin-Class" value="wmsplugin.WMSPlugin" />
Modified: packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch
2009-04-04 23:14:36 UTC (rev 2132)
+++ packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch
2009-04-04 23:30:56 UTC (rev 2133)
@@ -7,31 +7,14 @@
@DPATCH@
diff -urNad trunk~/agpifoj/build.xml trunk/agpifoj/build.xml
---- trunk~/agpifoj/build.xml 2009-01-01 18:55:45.000000000 +0100
-+++ trunk/agpifoj/build.xml 2009-02-16 11:23:37.000000000 +0100
-@@ -27,14 +27,6 @@
- <copy todir="build/images">
- <fileset dir="images" />
- </copy>
-- <exec append="false" output="REVISION" executable="svn"
failifexecutionfails="false">
-- <env key="LANG" value="C"/>
-- <arg value="info"/>
-- <arg value="--xml"/>
-- <arg value="."/>
-- </exec>
-- <xmlproperty file="REVISION" prefix="version" keepRoot="false"
collapseAttributes="true"/>
-- <delete file="REVISION"/>
- <jar destfile="${plugin.jar}" basedir="build">
- <manifest>
- <attribute name="Plugin-Class"
value="org.openstreetmap.josm.plugins.agpifoj.AgpifojPlugin" />
-@@ -50,6 +42,10 @@
- <echo message="creating ${plugin.jar}"/>
- <javac srcdir="src" classpath="${josm}" destdir="build">
- <compilerarg value="-Xlint:deprecation"/>
-+ <classpath>
-+ <file file="${josm}"/>
-+ <file file="/usr/share/java/metadata-extractor.jar"/>
-+ </classpath>
+--- 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="init">
+- <target name="dist" depends="compile,revision">
++ <target name="dist" depends="compile">
+ <copy todir="${plugin.build.dir}">
+ <fileset dir=".">
+ <include name="CHANGELOG"/>
Modified: packages/josm-plugins/trunk/debian/patches/80_measurement.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/80_measurement.dpatch
2009-04-04 23:14:36 UTC (rev 2132)
+++ packages/josm-plugins/trunk/debian/patches/80_measurement.dpatch
2009-04-04 23:30:56 UTC (rev 2133)
@@ -6,20 +6,14 @@
@DPATCH@
diff -urNad trunk~/measurement/build.xml trunk/measurement/build.xml
---- trunk~/measurement/build.xml 2009-01-01 18:55:45.000000000 +0100
-+++ trunk/measurement/build.xml 2009-02-16 10:57:20.000000000 +0100
-@@ -20,14 +20,6 @@
- <copy todir="build/images">
- <fileset dir="images" />
+--- 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>
-- <exec append="false" output="REVISION" executable="svn"
failifexecutionfails="false">
-- <env key="LANG" value="C"/>
-- <arg value="info"/>
-- <arg value="--xml"/>
-- <arg value="."/>
-- </exec>
-- <xmlproperty file="REVISION" prefix="version" keepRoot="false"
collapseAttributes="true"/>
-- <delete file="REVISION"/>
- <jar destfile="${plugin.jar}" basedir="build">
- <manifest>
- <attribute name="Plugin-Class"
value="org.openstreetmap.josm.plugins.measurement.MeasurementPlugin" />
Modified: packages/josm-plugins/trunk/debian/patches/90_openvisible.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/90_openvisible.dpatch
2009-04-04 23:14:36 UTC (rev 2132)
+++ packages/josm-plugins/trunk/debian/patches/90_openvisible.dpatch
2009-04-04 23:30:56 UTC (rev 2133)
@@ -7,53 +7,14 @@
@DPATCH@
diff -urNad trunk~/openvisible/build.xml trunk/openvisible/build.xml
---- trunk~/openvisible/build.xml 2009-01-01 18:55:45.000000000 +0100
-+++ trunk/openvisible/build.xml 2009-02-16 11:10:19.000000000 +0100
-@@ -22,7 +22,7 @@
- <property name="plugin.site.url"
value="http://www.tegmento.org/~cdaller/josm/${ant.project.name}/"/>
- <property name="plugin.site.upload.target"
value="cdal...@www.tegmento.org:public_html/josm/${ant.project.name}/"/>
- <property name="ant.build.javac.target" value="1.5"/>
-- <target name="dist" depends="compile,site">
+--- 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">
- <!-- images -->
<copy todir="${plugin.build.dir}/images">
- <fileset dir="images" />
-@@ -34,17 +34,8 @@
- </fileset>
- </copy>
- -->
-- <mkdir dir="${plugin.dist.dir}"/>
-- <exec append="false" output="REVISION" executable="svn"
failifexecutionfails="false">
-- <env key="LANG" value="C"/>
-- <arg value="info"/>
-- <arg value="--xml"/>
-- <arg value="."/>
-- </exec>
-- <xmlproperty file="REVISION" prefix="version" keepRoot="false"
collapseAttributes="true"/>
-- <delete file="REVISION"/>
- <!-- create jar file -->
-- <jar destfile="${plugin.dist.dir}/${plugin.jar}"
basedir="${plugin.build.dir}">
-+ <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
- <manifest>
- <attribute name="Plugin-Class" value="${plugin.class}" />
- <attribute name="Plugin-Description"
value="${plugin.description}" />
-@@ -61,10 +52,7 @@
- <mkdir dir="${plugin.build.dir}"/>
- <javac srcdir="src" destdir="${plugin.build.dir}" debug="true"
source="1.5" target="1.5">
- <classpath>
-- <pathelement path="${josm.build.dir}/build"/>
-- <fileset dir="${josm.build.dir}/lib">
-- <include name="**/*.jar"/>
-- </fileset>
-+ <pathelement path="${josm}"/>
- <!--
- <fileset dir="lib">
- <include name="**/*.jar"/>
-@@ -136,6 +124,6 @@
- <target name="clean">
- <delete dir="${plugin.build.dir}" />
- <delete dir="${plugin.site.file}" />
-- <delete file="${plugin.dist.dir}/${plugin.jar}" />
-+ <delete file="${plugin.jar}" />
- </target>
- </project>
+ <fileset dir="images"/>
+ </copy>
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
