Author: gmascellani-guest
Date: 2009-02-15 19:05:56 +0000 (Sun, 15 Feb 2009)
New Revision: 1888

Modified:
   packages/josm-plugins/trunk/debian/changelog
   packages/josm-plugins/trunk/debian/control
   packages/josm-plugins/trunk/debian/master.xml
   packages/josm-plugins/trunk/debian/rules
Log:
Bumping to last SVN release


Modified: packages/josm-plugins/trunk/debian/changelog
===================================================================
--- packages/josm-plugins/trunk/debian/changelog        2009-02-15 18:18:46 UTC 
(rev 1887)
+++ packages/josm-plugins/trunk/debian/changelog        2009-02-15 19:05:56 UTC 
(rev 1888)
@@ -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

Modified: packages/josm-plugins/trunk/debian/control
===================================================================
--- packages/josm-plugins/trunk/debian/control  2009-02-15 18:18:46 UTC (rev 
1887)
+++ packages/josm-plugins/trunk/debian/control  2009-02-15 19:05:56 UTC (rev 
1888)
@@ -3,8 +3,8 @@
 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 @@
 
 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 @@
  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

Modified: packages/josm-plugins/trunk/debian/master.xml
===================================================================
--- packages/josm-plugins/trunk/debian/master.xml       2009-02-15 18:18:46 UTC 
(rev 1887)
+++ packages/josm-plugins/trunk/debian/master.xml       2009-02-15 19:05:56 UTC 
(rev 1888)
@@ -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 dir="../colorscheme"   antfile="build.xml" target="dist">
+            <property name="plugin.jar"     
value="${plugin.dist.dir}/colorscheme.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>
-        
         <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>

Modified: packages/josm-plugins/trunk/debian/rules
===================================================================
--- packages/josm-plugins/trunk/debian/rules    2009-02-15 18:18:46 UTC (rev 
1887)
+++ packages/josm-plugins/trunk/debian/rules    2009-02-15 19:05:56 UTC (rev 
1888)
@@ -14,29 +14,36 @@
 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


_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to