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 1cc7731def6923b6a950ab69723edb3f0fb7ecc1
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date: Sun Feb 15 19:05:56 2009 +0000
Bumping to last SVN release
---
debian/changelog | 6 ++++++
debian/control | 9 +++------
debian/master.xml | 53 +++++++++++++++++------------------------------------
debian/rules | 23 +++++++++++++++--------
4 files changed, 41 insertions(+), 50 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7734533..13e9181 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm-plugins (0.0.svn13741-1) UNRELEASED; urgency=low
+
+ * New upstream revision
+
+ -- Giovanni Mascellani <g.mascell...@gmail.com> Sun, 15 Feb 2009 19:34:54
+0100
+
josm-plugins (0.0.0.20080518-1) unstable; urgency=low
* Upstream SVN revision number again available for plugins ywms and
diff --git a/debian/control b/debian/control
index ba25466..3cd83e2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +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 (>= 0.0.0.20080512)
+Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), openjdk-6-jdk,
+ josm (>= 0.0.svn1387)
Standards-Version: 3.8.0
Homepage: http://josm.openstreetmap.de
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm-plugins/
@@ -12,7 +12,7 @@ Vcs-Browser:
http://svn.debian.org/viewsvn/pkg-grass/packages/josm-plugins/
Package: josm-plugins
Architecture: all
-Depends: josm (>= 0.0.0.20080512)
+Depends: josm (>= 0.0.svn1387)
Suggests: gpsd, iceweasel
Description: Plugins for JOSM
JOSM (Java OpenStreetMap) plugin collection.
@@ -20,13 +20,10 @@ Description: Plugins for JOSM
This package contains the following plugins:
* colorscheme - Allows to create different color schemes.
* livegps - Supports live GPS input together with gpsd.
- * namefinder - Allows input of place names in JOSM download dialog.
* slippymap - Displays a slippy map grid in JOSM.
* utilsplugin - Several helper utilities.
* validator - Data validator.
* wmsplugin - Displays background images from any WMS source.
- * ywms - WMS server for Yahoo imagery.
- * slippy_map_chooser - Displays a slippy map grid in JOSM download dialog.
.
JOSM is an editor for OpenStreetMap (OSM) written in Java.
The current version supports stand alone GPX tracks, GPX track data
diff --git a/debian/master.xml b/debian/master.xml
index 019164a..d1ff386 100644
--- a/debian/master.xml
+++ b/debian/master.xml
@@ -14,58 +14,39 @@
</target>
<target name="build" depends="init">
-
- <ant dir="../validator" antfile="build.xml" target="dist">
- <property name="plugin.jar"
value="${plugin.dist.dir}/validator.jar"/>
- </ant>
-
- <ant dir="../utilsplugin" antfile="build.xml" target="dist">
- <property name="plugin.jar"
value="${plugin.dist.dir}/utilsplugin.jar"/>
- </ant>
-
- <ant dir="../wmsplugin" antfile="build.xml" target="dist">
- <property name="plugin.jar"
value="${plugin.dist.dir}/wmsplugin.jar"/>
+
+ <ant dir="../colorscheme" antfile="build.xml" target="dist">
+ <property name="plugin.jar"
value="${plugin.dist.dir}/colorscheme.jar"/>
</ant>
<ant dir="../livegps" antfile="build.xml" target="dist">
<property name="plugin.jar"
value="${plugin.dist.dir}/livegps.jar"/>
</ant>
- <!--
- <ant dir="../lang" antfile="build.xml" target="dist">
- <property name="plugin.jar"
value="${plugin.dist.dir}/lang.jar"/>
- </ant>
- -->
- <ant dir="../namefinder" antfile="build.xml" target="dist">
- <property name="plugin.jar"
value="${plugin.dist.dir}/namefinder.jar"/>
- </ant>
-
- <ant dir="../colorscheme" antfile="build.xml" target="dist">
- <property name="plugin.jar"
value="${plugin.dist.dir}/colorscheme.jar"/>
- </ant>
<ant dir="../slippymap" antfile="build.xml" target="dist">
<property name="plugin.jar"
value="${plugin.dist.dir}/slippymap.jar"/>
</ant>
-
- <ant dir="../ywms" antfile="build.xml" target="dist">
- <property name="plugin.jar"
value="${plugin.dist.dir}/ywms.jar"/>
+
+ <ant dir="../utilsplugin" antfile="build.xml" target="dist">
+ <property name="plugin.jar"
value="${plugin.dist.dir}/utilsplugin.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 dir="../validator" antfile="build.xml" target="dist">
+ <property name="plugin.jar"
value="${plugin.dist.dir}/validator.jar"/>
+ </ant>
+
+ <ant dir="../wmsplugin" antfile="build.xml" target="dist">
+ <property name="plugin.jar"
value="${plugin.dist.dir}/wmsplugin.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="../livegps" 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"/>
+ <ant dir="../utilsplugin" antfile="build.xml" target="clean"/>
+ <ant dir="../validator" antfile="build.xml" target="clean"/>
+ <ant dir="../wmsplugin" antfile="build.xml" target="clean"/>
<delete dir="../tmp"/>
<delete dir="${plugin.dist.dir}"/>
</target>
diff --git a/debian/rules b/debian/rules
index 8dc968f..84b3e14 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,29 +14,36 @@ 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 slippy_map_chooser
+PLUGINS := colorscheme livegps slippymap utilsplugin validator wmsplugin
DATE := $(shell date +%Y%m%d)
+ifdef SVNREV
+VERSION := 0.0.svn${SVNREV}
+else
+VERSION := 0.0.0.${DATE}
+endif
+DESTDIR := ../tarballs/josm-plugins-${VERSION}
+DESTTGZ := ../tarballs/josm-plugins_${VERSION}.orig.tar.gz
get-orig-source:
dh_testdir
test -d ../tarballs/. || mkdir -p ../tarballs
@echo Downloading josm-plugins from ${SVNREPO}
- @mkdir ../tarballs/josm-plugins-0.0.0.${DATE}
+ @mkdir ${DESTDIR}
@for plugin in $(PLUGINS); do \
echo "Fetching $$plugin plugin"; \
- svn export -r HEAD ${SVNREPO}/"$$plugin"
../tarballs/josm-plugins-0.0.0.${DATE}/"$$plugin"; \
+ svn export -r HEAD ${SVNREPO}/"$$plugin"
${DESTDIR}/"$$plugin"; \
done
- svn info --xml
http://svn.openstreetmap.org/applications/editors/josm/plugins/ >
../tarballs/josm-plugins-0.0.0.${DATE}/svn-info.xml
+ svn info --xml
http://svn.openstreetmap.org/applications/editors/josm/plugins/ >
${DESTDIR}/svn-info.xml
@echo Removing jar files
- find ../tarballs/josm-plugins-0.0.0.${DATE} -name "*.jar" -exec rm -v
{} \;
+ find ${DESTDIR} -name "*.jar" -exec rm -v {} \;
@echo Building snapshot tarball
- tar czf ../tarballs/josm-plugins_0.0.0.${DATE}.orig.tar.gz -C
../tarballs josm-plugins-0.0.0.${DATE}
+ tar czf ${DESTTGZ} -C `dirname ${DESTDIR}` `basename ${DESTDIR}`
@echo Cleaning up
- rm -rf ../tarballs/josm-plugins-0.0.0.${DATE}
+ rm -rf ${DESTDIR}
@echo .
@echo To update debian/changelog type
- @echo dch -v 0.0.0.${DATE}-1
+ @echo dch -v ${VERSION}-1
@echo .
.PHONY: get-orig-source
--
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
