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 2240a78ea6b062d5d0b9d2e81cc272774f841472 Author: David Paleino <da...@debian.org> Date: Mon Apr 5 17:20:09 2010 +0200 Try to depend on a version of jgrapht in main --- debian/changelog | 3 ++- debian/control | 4 ++-- debian/patches/150_routing.dpatch | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 985859a..7716e07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ josm-plugins (0.0.svn20358-1) UNRELEASED; urgency=low - move package from Section java to utils, according to archive override - Vcs-* fields updated, package moved to Git + - Build-Depend on libgrapht0.8 * debian/copyright updated [ Giovanni Mascellani ] @@ -26,7 +27,7 @@ josm-plugins (0.0.svn20358-1) UNRELEASED; urgency=low + validator - Bad license * Standards-Version bumped to 3.8.4 (no changes required) - -- David Paleino <da...@debian.org> Mon, 05 Apr 2010 09:17:49 +0200 + -- David Paleino <da...@debian.org> Wed, 02 Jun 2010 10:10:36 +0200 josm-plugins (0.0.svn18009-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 218a69f..84ff0c5 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Uploaders: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>, , Debian OpenStreetMap Team <pkg-osm-ma...@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 | libjgrapht-java Build-Conflicts: josm (>= 0.0.svn3095) Standards-Version: 3.8.4 Homepage: http://josm.openstreetmap.de/wiki/Plugins @@ -18,7 +18,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-grass/josm-plugins.git Package: josm-plugins Architecture: all Depends: josm (>= 0.0.svn3094), libmetadata-extractor-java, ${misc:Depends}, - liblog4j1.2-java, libjgrapht0.7-java + liblog4j1.2-java, libjgrapht0.8-java | libjgrapht-java Conflicts: josm (>= 0.0.svn3095) Suggests: gpsd Description: Plugins for JOSM diff --git a/debian/patches/150_routing.dpatch b/debian/patches/150_routing.dpatch index 06c93a4..d51fd34 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-04-05 17:43:30.000000000 +0200 ++++ josm-plugins/routing/build.xml 2010-06-02 10:09:33.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 --> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel