[josm-plugins] 04/05: Patch was missing...

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to tag debian/0.0.0.20080413-2
in repository josm-plugins.

commit abda143b36a2662ab08d4e36d65cf8e8d7c35bc8
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Fri Aug 8 09:47:31 2008 +0000

    Patch was missing...
---
 debian/patches/40_ftbfs.dpatch | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/debian/patches/40_ftbfs.dpatch b/debian/patches/40_ftbfs.dpatch
new file mode 100755
index 0000000..d20ef30
--- /dev/null
+++ b/debian/patches/40_ftbfs.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_ftbfs.dpatch by  <g.mascellani at gmail.com>
+##
+## DP: Fixes FTBFS with recent JOSM
+
+ at DPATCH@
+diff -urNad josm-plugins-0.0.0.20080413~/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java josm-plugins-0.0.0.20080413/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java
+--- josm-plugins-0.0.0.20080413~/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java	2007-04-18 23:56:19.000000000 +0200
++++ josm-plugins-0.0.0.20080413/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java	2008-08-08 11:38:53.000000000 +0200
+@@ -47,15 +47,16 @@
+ 		this.newKey = newKey;
+ 	}
+ 	
+-	@Override public void executeCommand() {
+-		super.executeCommand(); // save old
++	@Override public boolean executeCommand() {
++		if (!super.executeCommand()) return false; // save old
+ 		for (OsmPrimitive osm : objects) {
+ 			if(osm.keys != null) 
+ 			{
+ 				osm.modified = true;
+ 				osm.put(newKey, osm.keys.remove(key) );
+ 			}
+-		}
++		}
++		return true;
+ 	}
+ 
+ 	@Override public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git