[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn4878+dfsg1-1-10-gdbb37da

[David Paleino]

The following commit has been merged in the master branch:
commit 8b42ca6cfc801043ebe90d577eeabbad5e0b3b7a
Author: David Paleino <dapal at debian.org>
Date:   Thu Mar 22 17:56:52 2012 +0100

    Fix deprecated method in patch

diff --git a/debian/patches/40-elemstyles.patch b/debian/patches/40-elemstyles.patch
index d43ae84..45b31ae 100644
--- a/debian/patches/40-elemstyles.patch
+++ b/debian/patches/40-elemstyles.patch
@@ -57,7 +57,7 @@ applications. This patch points josm to the shared directories.
 +                String realIconName = iconName.replaceAll("styles/standard/", "");
 +                LinkedList<String> dirs = new LinkedList<String>();
 +                MapPaintStyles.addDebianDirs(dirs);
-+                icon = ImageProvider.getIfAvailable(dirs, "presets", null, realIconName, zipIcons);
++                icon = new ImageProvider(realIconName).setDirs(dirs).setId("presets").setArchive(zipIcons).setOptional(true).get();
 +            }
 +            if (icon == null) {
 +                System.out.println("Could not get presets icon " + iconName);

-- 
Editor for OpenStreetMap