The following commit has been merged in the master branch: commit f66dddcc4c48a67c5d30292f79e54b28bfda98e3 Author: Giovanni Mascellani <g...@debian.org> Date: Sat Sep 10 00:33:21 2011 +0200
Many patches not needed anymore. diff --git a/debian/patches/100_surveyor.diff b/debian/patches/100_surveyor.diff deleted file mode 100644 index d04af86..0000000 --- a/debian/patches/100_surveyor.diff +++ /dev/null @@ -1,14 +0,0 @@ -Patch for plugin surveyor - * Disable upstream SVN access -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.diff b/debian/patches/10_colorscheme.diff deleted file mode 100644 index e536e67..0000000 --- a/debian/patches/10_colorscheme.diff +++ /dev/null @@ -1,14 +0,0 @@ -Patch for plugin colorscheme - * Disable upstream SVN access -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.diff b/debian/patches/110_cadastre-fr.diff deleted file mode 100644 index 7ebdb63..0000000 --- a/debian/patches/110_cadastre-fr.diff +++ /dev/null @@ -1,14 +0,0 @@ -Patch for plugin cadastre-fr - * Disable upstream SVN access -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> -- <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.diff b/debian/patches/120_DirectUpload.diff deleted file mode 100644 index d485272..0000000 --- a/debian/patches/120_DirectUpload.diff +++ /dev/null @@ -1,17 +0,0 @@ -Patch for plugin DirectUpload - * Disable upstream SVN access ---- - DirectUpload/build.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- josm-plugins.orig/DirectUpload/build.xml -+++ josm-plugins/DirectUpload/build.xml -@@ -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.diff b/debian/patches/130_editgpx.diff deleted file mode 100644 index 6a90368..0000000 --- a/debian/patches/130_editgpx.diff +++ /dev/null @@ -1,17 +0,0 @@ -Patch for plugin editgpx - * Disable upstream SVN access ---- - editgpx/build.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- josm-plugins.orig/editgpx/build.xml -+++ josm-plugins/editgpx/build.xml -@@ -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.diff b/debian/patches/140_lakewalker.diff deleted file mode 100644 index 7589b5b..0000000 --- a/debian/patches/140_lakewalker.diff +++ /dev/null @@ -1,14 +0,0 @@ -Patch for plugin lakewalker - * Disable upstream SVN access -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/20_livegps.diff b/debian/patches/20_livegps.diff deleted file mode 100644 index dbc2f85..0000000 --- a/debian/patches/20_livegps.diff +++ /dev/null @@ -1,14 +0,0 @@ -Patch for plugin livegps - * Disable upstream SVN access -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/80_measurement.diff b/debian/patches/80_measurement.diff deleted file mode 100644 index ceaa87f..0000000 --- a/debian/patches/80_measurement.diff +++ /dev/null @@ -1,14 +0,0 @@ -Patch for plugin measurement - * Disable upstream SVN access -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.diff b/debian/patches/90_openvisible.diff deleted file mode 100644 index 48a0869..0000000 --- a/debian/patches/90_openvisible.diff +++ /dev/null @@ -1,14 +0,0 @@ -Patch for plugin openvisible - * Disable upstream SVN access -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> diff --git a/debian/patches/series b/debian/patches/series index 10a41f4..fbb989b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,10 +1 @@ 150_routing.diff -140_lakewalker.diff -130_editgpx.diff -120_DirectUpload.diff -110_cadastre-fr.diff -100_surveyor.diff -90_openvisible.diff -80_measurement.diff -20_livegps.diff -10_colorscheme.diff -- Plugins for JOSM _______________________________________________ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits