[josm-plugins] 220/369: Removed patches applied to removed plugins
Bas Couwenberg
sebastic at xs4all.nl
Sat Oct 18 12:03:45 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository josm-plugins.
commit 7f4a03bb2420ea9a06841b55fd056c2fcff10d91
Author: David Paleino <dapal at debian.org>
Date: Sat Jan 1 22:27:50 2011 +0100
Removed patches applied to removed plugins
---
debian/changelog | 3 ++-
debian/patches/160_remotecontrol.diff | 19 ------------------
debian/patches/180_imagery.diff | 38 -----------------------------------
debian/patches/30_slippymap.diff | 14 -------------
debian/patches/60_wmsplugin.diff | 29 --------------------------
debian/patches/series | 4 ----
6 files changed, 2 insertions(+), 105 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3c5c5b7..f556bb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ josm-plugins (0.0.svn24925-1) UNRELEASED; urgency=low
remotecontrol, imagery.
* Bump JOSM requirement on 3751
* debian/copyright: remove information about removed plugins
+ * Removed patches applied to removed plugins
- -- David Paleino <dapal at debian.org> Sat, 01 Jan 2011 22:25:22 +0100
+ -- David Paleino <dapal at debian.org> Sat, 01 Jan 2011 22:27:37 +0100
josm-plugins (0.0.svn24632-1) unstable; urgency=low
diff --git a/debian/patches/160_remotecontrol.diff b/debian/patches/160_remotecontrol.diff
deleted file mode 100644
index 25117da..0000000
--- a/debian/patches/160_remotecontrol.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: disable build-time SVN access
-Forwarded: not-needed
-
----
- remotecontrol/build.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- josm-plugins.orig/remotecontrol/build.xml
-+++ josm-plugins/remotecontrol/build.xml
-@@ -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/180_imagery.diff b/debian/patches/180_imagery.diff
deleted file mode 100644
index db45ed2..0000000
--- a/debian/patches/180_imagery.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: fix remotecontrol dependency, and fix build
-Forwarded: not-needed
-
----
- imagery/build.xml | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
---- josm-plugins.orig/imagery/build.xml
-+++ josm-plugins/imagery/build.xml
-@@ -40,13 +40,13 @@
- ** should not be necessary to change the following properties
- -->
- <property name="josm" location="../../core/dist/josm-custom.jar"/>
-- <property name="remotecontrol" location="../../dist/remotecontrol.jar" />
- <property name="plugin.build.dir" value="build"/>
- <property name="plugin.src.dir" value="src"/>
- <!-- this is the directory where the plugin jar is copied to -->
- <property name="plugin.dist.dir" value="../../dist"/>
- <property name="ant.build.javac.target" value="1.5"/>
- <property name="plugin.dist.dir" value="../../dist"/>
-+ <property name="remotecontrol" location="${plugin.dist.dir}/remotecontrol.jar" />
- <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
-
- <!--
-@@ -76,11 +76,8 @@
- ** dist - creates the plugin jar
- **********************************************************
- -->
-- <target name="dist" depends="compile,revision">
-+ <target name="dist" depends="compile">
- <echo message="creating ${ant.project.name}.jar ... "/>
-- <copy todir="${plugin.build.dir}/resources">
-- <fileset dir="resources"/>
-- </copy>
- <copy todir="${plugin.build.dir}/images">
- <fileset dir="images"/>
- </copy>
diff --git a/debian/patches/30_slippymap.diff b/debian/patches/30_slippymap.diff
deleted file mode 100644
index 0eade02..0000000
--- a/debian/patches/30_slippymap.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Patch for plugin slippymap
- * Disable upstream SVN access
-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/60_wmsplugin.diff b/debian/patches/60_wmsplugin.diff
deleted file mode 100644
index a80b78d..0000000
--- a/debian/patches/60_wmsplugin.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Patch for plugin wmsplugin
- * Disable upstream SVN access
- * Fix classpath issues with remotecontrol.jar
----
- wmsplugin/build.xml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- josm-plugins.orig/wmsplugin/build.xml
-+++ josm-plugins/wmsplugin/build.xml
-@@ -31,9 +31,9 @@
- <property name="plugin.main.version" value="3530" />
-
- <property name="josm" location="../../core/dist/josm-custom.jar" />
-- <property name="remotecontrol" location="../../dist/remotecontrol.jar" />
- <property name="plugin.dist.dir" value="../../dist" />
- <property name="plugin.build.dir" value="build" />
-+ <property name="remotecontrol" location="${plugin.dist.dir}/remotecontrol.jar" />
- <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar" />
- <property name="ant.build.javac.target" value="1.5" />
-
-@@ -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/series b/debian/patches/series
index 12e5c24..9caa9c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-180_imagery.diff
-160_remotecontrol.diff
150_routing.diff
140_lakewalker.diff
130_editgpx.diff
@@ -8,8 +6,6 @@
100_surveyor.diff
90_openvisible.diff
80_measurement.diff
-60_wmsplugin.diff
-30_slippymap.diff
20_livegps.diff
10_colorscheme.diff
170-fix_webkitimagegtk.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git
More information about the Pkg-grass-devel
mailing list