[DebianGIS-dev] r1754 - packages/josm-plugins/branches/0.0.0.20080413/debian/patches

[gmascellani-guest at alioth.debian.org]

Author: gmascellani-guest
Date: 2008-08-08 09:47:31 +0000 (Fri, 08 Aug 2008)
New Revision: 1754

Added:
   packages/josm-plugins/branches/0.0.0.20080413/debian/patches/40_ftbfs.dpatch
Log:
Patch was missing...


Added: packages/josm-plugins/branches/0.0.0.20080413/debian/patches/40_ftbfs.dpatch
===================================================================
--- packages/josm-plugins/branches/0.0.0.20080413/debian/patches/40_ftbfs.dpatch	                        (rev 0)
+++ packages/josm-plugins/branches/0.0.0.20080413/debian/patches/40_ftbfs.dpatch	2008-08-08 09:47:31 UTC (rev 1754)
@@ -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) {


Property changes on: packages/josm-plugins/branches/0.0.0.20080413/debian/patches/40_ftbfs.dpatch
___________________________________________________________________
Name: svn:executable
   + *