[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. upstream/0.0.svn18009-37-g75f4562

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit 1508c5cc82eb757d9a9838ae68a9f23922ab417e
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Fri May 14 17:32:37 2010 +0200

    Using libjgrapht0.8-java

diff --git a/debian/control b/debian/control
index 218a69f..40fc888 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>,
  , Debian OpenStreetMap Team <pkg-osm-maint at lists.alioth.debian.org>
 Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), default-jdk,
  josm (>= 0.0.svn3094), libmetadata-extractor-java, liblog4j1.2-java,
- libjgrapht0.7-java
+ libjgrapht0.8-java
 Build-Conflicts: josm (>= 0.0.svn3095)
 Standards-Version: 3.8.4
 Homepage: http://josm.openstreetmap.de/wiki/Plugins
diff --git a/debian/patches/150_routing.dpatch b/debian/patches/150_routing.dpatch
index 06c93a4..5418875 100755
--- a/debian/patches/150_routing.dpatch
+++ b/debian/patches/150_routing.dpatch
@@ -7,15 +7,15 @@
 
 @DPATCH@
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' josm-plugins~/routing/build.xml josm-plugins/routing/build.xml
---- josm-plugins~/routing/build.xml	2010-03-30 00:03:05.000000000 +0200
-+++ josm-plugins/routing/build.xml	2010-03-30 10:58:14.000000000 +0200
+--- josm-plugins~/routing/build.xml	2010-05-14 17:02:29.000000000 +0200
++++ josm-plugins/routing/build.xml	2010-05-14 17:30:34.000000000 +0200
 @@ -34,8 +34,8 @@
  	<property name="plugin.dist.dir"        value="../../dist"/>
  	<property name="plugin.build.dir"       value="build"/>
  	<property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.name}.jar"/>
 -	<property name="jgrapht"                value="lib/jgrapht-jdk1.5.jar"/>
 -	<property name="log4j"                  value="lib/log4j-1.2.15.jar"/>
-+	<property name="jgrapht"                value="/usr/share/java/jgrapht.jar"/>
++	<property name="jgrapht"                value="/usr/share/java/jgrapht0.8.jar"/>
 +	<property name="log4j"                  value="/usr/share/java/log4j-1.2.jar"/>
  	<property name="ant.build.javac.target" value="1.5"/>
  	<!-- Some initializations for several other targets -->

-- 
Plugins for josm