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 287c93c6b56e91fd36dc05d961b0884cd41166f0 Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it> Date: Sun May 18 16:00:50 2008 +0000 Enabled plugin slippy_map_chooser --- debian/changelog | 3 ++- debian/control | 5 +++-- debian/master.xml | 21 +++++++++++++-------- debian/patches/30_build.dpatch | 28 +++++++++++++++++++++------- debian/rules | 2 +- 5 files changed, 40 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3378fd8..bf52990 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -josm-plugins (0.0.0.20080413-2) UNRELEASED; urgency=low +josm-plugins (0.0.0.20080518-1) UNRELEASED; urgency=low * Upstream SVN revision number again available for plugins ywms and validator. * Added Vcs-* fields in debian/control + * Enables plugin slippy_map_chooser -- Giovanni Mascellani <g.mascell...@gmail.com> Sun, 18 May 2008 15:54:49 +0200 diff --git a/debian/control b/debian/control index d9d2364..4d3d82f 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: utils Priority: extra Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Giovanni Mascellani <g.mascell...@gmail.com>, Andreas Putzo <andr...@putzo.net> -Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), java-gcj-compat-dev, josm +Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), java-gcj-compat-dev, + josm (>= 0.0.0.20080512) Standards-Version: 3.7.3 Homepage: http://josm.openstreetmap.de Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm-plugins/ @@ -11,7 +12,7 @@ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/josm-plugins/ Package: josm-plugins Architecture: all -Depends: josm +Depends: josm (>= 0.0.0.20080512) Suggests: gpsd, iceweasel Description: Plugins for JOSM JOSM (Java OpenStreetMap) plugin collection. diff --git a/debian/master.xml b/debian/master.xml index e1e2310..019164a 100644 --- a/debian/master.xml +++ b/debian/master.xml @@ -51,16 +51,21 @@ <property name="plugin.jar" value="${plugin.dist.dir}/ywms.jar"/> </ant> + <ant dir="../slippy_map_chooser" antfile="build.xml" target="dist"> + <property name="plugin.jar" value="${plugin.dist.dir}/slippy_map_chooser.jar"/> + </ant> + </target> <target name="clean"> - <ant dir="../validator" antfile="build.xml" target="clean"/> - <ant dir="../utilsplugin" antfile="build.xml" target="clean"/> - <ant dir="../wmsplugin" antfile="build.xml" target="clean"/> - <ant dir="../livegps" antfile="build.xml" target="clean"/> - <ant dir="../namefinder" antfile="build.xml" target="clean"/> - <ant dir="../colorscheme" antfile="build.xml" target="clean"/> - <ant dir="../slippymap" antfile="build.xml" target="clean"/> - <ant dir="../ywms" antfile="build.xml" target="clean"/> + <ant dir="../validator" antfile="build.xml" target="clean"/> + <ant dir="../utilsplugin" antfile="build.xml" target="clean"/> + <ant dir="../wmsplugin" antfile="build.xml" target="clean"/> + <ant dir="../livegps" antfile="build.xml" target="clean"/> + <ant dir="../namefinder" antfile="build.xml" target="clean"/> + <ant dir="../colorscheme" antfile="build.xml" target="clean"/> + <ant dir="../slippymap" antfile="build.xml" target="clean"/> + <ant dir="../ywms" antfile="build.xml" target="clean"/> + <ant dir="../slippy_map_chooser" antfile="build.xml" target="clean"/> <delete dir="../tmp"/> <delete dir="${plugin.dist.dir}"/> </target> diff --git a/debian/patches/30_build.dpatch b/debian/patches/30_build.dpatch index 505ac20..e784a95 100755 --- a/debian/patches/30_build.dpatch +++ b/debian/patches/30_build.dpatch @@ -1,12 +1,13 @@ #! /bin/sh /usr/share/dpatch/dpatch-run ## 30_build.dpatch by Andreas Putzo <andr...@putzo.net> ## -## DP: Fix mistake in clean targets of the colorscheme and livegps plugin. +## DP: Fix mistake in clean targets of the colorscheme and livegps plugin +## DP: and in compile target of the slippy_map_chooser plugin. @DPATCH@ -diff -urNad josm-plugins-0.0.0.20080413~/colorscheme/build.xml josm-plugins-0.0.0.20080413/colorscheme/build.xml ---- josm-plugins-0.0.0.20080413~/colorscheme/build.xml 2008-04-06 19:10:11.000000000 +0000 -+++ josm-plugins-0.0.0.20080413/colorscheme/build.xml 2008-04-13 10:27:25.000000000 +0000 +diff -urNad josm-plugins-0.0.0.20080518~/colorscheme/build.xml josm-plugins-0.0.0.20080518/colorscheme/build.xml +--- josm-plugins-0.0.0.20080518~/colorscheme/build.xml 2008-04-06 21:10:11.000000000 +0200 ++++ josm-plugins-0.0.0.20080518/colorscheme/build.xml 2008-05-18 16:09:07.000000000 +0200 @@ -69,7 +69,7 @@ </target> @@ -16,9 +17,9 @@ diff -urNad josm-plugins-0.0.0.20080413~/colorscheme/build.xml josm-plugins-0.0. <delete dir="${plugin.build.dir}" /> <delete file="${plugin.jar}" /> </target> -diff -urNad josm-plugins-0.0.0.20080413~/livegps/build.xml josm-plugins-0.0.0.20080413/livegps/build.xml ---- josm-plugins-0.0.0.20080413~/livegps/build.xml 2008-04-06 19:10:11.000000000 +0000 -+++ josm-plugins-0.0.0.20080413/livegps/build.xml 2008-04-13 10:27:25.000000000 +0000 +diff -urNad josm-plugins-0.0.0.20080518~/livegps/build.xml josm-plugins-0.0.0.20080518/livegps/build.xml +--- josm-plugins-0.0.0.20080518~/livegps/build.xml 2008-04-06 21:10:11.000000000 +0200 ++++ josm-plugins-0.0.0.20080518/livegps/build.xml 2008-05-18 16:09:07.000000000 +0200 @@ -79,7 +79,7 @@ <target name="clean"> @@ -27,3 +28,16 @@ diff -urNad josm-plugins-0.0.0.20080413~/livegps/build.xml josm-plugins-0.0.0.20 + <delete file="${plugin.site.file}" /> <delete file="${plugin.jar}" /> </target> + +diff -urNad josm-plugins-0.0.0.20080518~/slippy_map_chooser/build.xml josm-plugins-0.0.0.20080518/slippy_map_chooser/build.xml +--- josm-plugins-0.0.0.20080518~/slippy_map_chooser/build.xml 2008-04-06 21:10:11.000000000 +0200 ++++ josm-plugins-0.0.0.20080518/slippy_map_chooser/build.xml 2008-05-18 16:09:39.000000000 +0200 +@@ -38,7 +38,7 @@ + + <target name="compile" depends="init"> + <echo message="creating ${plugin.jar}"/> +- <javac srcdir="src" classpath="../../core/dist/josm-custom.jar" destdir="build" /> ++ <javac srcdir="src" classpath="${josm}" destdir="build" /> + </target> + + <target name="init"> diff --git a/debian/rules b/debian/rules index eef52ea..8dc968f 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ DEB_ANT_BUILD_TARGET := build DEB_ANT_CLEAN_TARGET := clean SVNREPO := http://svn.openstreetmap.org/applications/editors/josm/plugins/ -PLUGINS := colorscheme livegps namefinder slippymap utilsplugin validator wmsplugin ywms +PLUGINS := colorscheme livegps namefinder slippymap utilsplugin validator wmsplugin ywms slippy_map_chooser DATE := $(shell date +%Y%m%d) -- 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