[DebianGIS-dev] r1894 - in packages/josm-plugins/trunk/debian: . patches

gmascellani-guest at alioth.debian.org gmascellani-guest at alioth.debian.org
Mon Feb 16 10:13:36 UTC 2009


Author: gmascellani-guest
Date: 2009-02-16 10:13:35 +0000 (Mon, 16 Feb 2009)
New Revision: 1894

Added:
   packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
   packages/josm-plugins/trunk/debian/patches/110_usertools.dpatch
   packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch
   packages/josm-plugins/trunk/debian/patches/80_measurement.dpatch
   packages/josm-plugins/trunk/debian/patches/90_openvisible.dpatch
Modified:
   packages/josm-plugins/trunk/debian/master.xml
   packages/josm-plugins/trunk/debian/patches/00list
   packages/josm-plugins/trunk/debian/rules
Log:
 * Added new plugins: agpifoj, measurement, openvisible, surveyor, usertools
 * d/rules: HEAD was checked out instead of specified version


Modified: packages/josm-plugins/trunk/debian/master.xml
===================================================================
--- packages/josm-plugins/trunk/debian/master.xml	2009-02-15 23:22:53 UTC (rev 1893)
+++ packages/josm-plugins/trunk/debian/master.xml	2009-02-16 10:13:35 UTC (rev 1894)
@@ -15,6 +15,10 @@
    
     <target name="build" depends="init">
 
+        <ant dir="../agpifoj"   antfile="build.xml" target="dist">
+            <property name="plugin.jar"     value="${plugin.dist.dir}/agpifoj.jar"/>
+        </ant>
+
         <ant dir="../colorscheme"   antfile="build.xml" target="dist">
             <property name="plugin.jar"     value="${plugin.dist.dir}/colorscheme.jar"/>
         </ant>
@@ -22,11 +26,28 @@
         <ant dir="../livegps"   antfile="build.xml" target="dist">
             <property name="plugin.jar"     value="${plugin.dist.dir}/livegps.jar"/>
         </ant>
+        
+        <ant dir="../measurement"   antfile="build.xml" target="dist">
+            <property name="plugin.jar"     value="${plugin.dist.dir}/measurement.jar"/>
+        </ant>
+        
+        <ant dir="../openvisible"   antfile="build.xml" target="dist">
+            <property name="plugin.jar"     value="${plugin.dist.dir}/openvisible.jar"/>
+        </ant>
 
         <ant dir="../slippymap"   antfile="build.xml" target="dist">
             <property name="plugin.jar"     value="${plugin.dist.dir}/slippymap.jar"/>
         </ant>
+
+        <!-- surveyor must be compiled _after_ livegps -->
+        <ant dir="../surveyor"   antfile="build.xml" target="dist">
+            <property name="plugin.jar"     value="${plugin.dist.dir}/surveyor.jar"/>
+        </ant>
  
+        <ant dir="../usertools"   antfile="build.xml" target="dist">
+            <property name="plugin.jar"     value="${plugin.dist.dir}/usertools.jar"/>
+        </ant>
+ 
         <ant dir="../utilsplugin"   antfile="build.xml" target="dist">
             <property name="plugin.jar"     value="${plugin.dist.dir}/utilsplugin.jar"/>
         </ant>
@@ -40,10 +61,16 @@
         </ant>
 
     </target>
+
     <target name="clean">
+        <ant dir="../agpifoj"            antfile="build.xml" target="clean"/>
         <ant dir="../colorscheme"        antfile="build.xml" target="clean"/>
         <ant dir="../livegps"            antfile="build.xml" target="clean"/>
+        <ant dir="../measurement"        antfile="build.xml" target="clean"/>
+        <ant dir="../openvisible"        antfile="build.xml" target="clean"/>
         <ant dir="../slippymap"          antfile="build.xml" target="clean"/>
+        <ant dir="../surveyor"           antfile="build.xml" target="clean"/>
+        <ant dir="../usertools"          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"/>

Modified: packages/josm-plugins/trunk/debian/patches/00list
===================================================================
--- packages/josm-plugins/trunk/debian/patches/00list	2009-02-15 23:22:53 UTC (rev 1893)
+++ packages/josm-plugins/trunk/debian/patches/00list	2009-02-16 10:13:35 UTC (rev 1894)
@@ -4,3 +4,8 @@
 40_utilsplugin
 50_validator
 60_wmsplugin
+70_agpifoj
+80_measurement
+90_openvisible
+100_surveyor
+110_usertools

Added: packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch	                        (rev 0)
+++ packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch	2009-02-16 10:13:35 UTC (rev 1894)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 100_surveyor.dpatch by  <g.mascellani at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/surveyor/build.xml trunk/surveyor/build.xml
+--- trunk~/surveyor/build.xml	2009-01-23 22:36:04.000000000 +0100
++++ trunk/surveyor/build.xml	2009-02-16 11:06:30.000000000 +0100
+@@ -20,14 +20,6 @@
+         </javac>
+     </target>
+     <target name="dist" depends="compile">
+-        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+-            <env key="LANG" value="C"/>
+-            <arg value="info"/>
+-            <arg value="--xml"/>
+-            <arg value="."/>
+-        </exec>
+-        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+-        <delete file="REVISION"/>
+         <copy todir="${plugin.build.dir}/">
+             <fileset dir="resources">
+                 <include name="*.xml"/>


Property changes on: packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/josm-plugins/trunk/debian/patches/110_usertools.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/110_usertools.dpatch	                        (rev 0)
+++ packages/josm-plugins/trunk/debian/patches/110_usertools.dpatch	2009-02-16 10:13:35 UTC (rev 1894)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 110_usertools.dpatch by  <g.mascellani at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/usertools/build.xml trunk/usertools/build.xml
+--- trunk~/usertools/build.xml	2009-01-09 10:04:33.000000000 +0100
++++ trunk/usertools/build.xml	2009-02-16 11:08:10.000000000 +0100
+@@ -16,14 +16,6 @@
+         </javac>
+     </target>
+     <target name="dist" depends="compile">
+-        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+-            <env key="LANG" value="C"/>
+-            <arg value="info"/>
+-            <arg value="--xml"/>
+-            <arg value="."/>
+-        </exec>
+-        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+-        <delete file="REVISION"/>
+         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+             <manifest>
+                 <attribute name="Plugin-Class" value="usertools.UserToolsPlugin" />


Property changes on: packages/josm-plugins/trunk/debian/patches/110_usertools.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch	                        (rev 0)
+++ packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch	2009-02-16 10:13:35 UTC (rev 1894)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70_agpifoj.dpatch by  <g.mascellani at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/agpifoj/build.xml trunk/agpifoj/build.xml
+--- trunk~/agpifoj/build.xml	2009-01-01 18:55:45.000000000 +0100
++++ trunk/agpifoj/build.xml	2009-02-16 11:08:56.000000000 +0100
+@@ -27,14 +27,6 @@
+         <copy todir="build/images">
+             <fileset dir="images" />
+         </copy>
+-        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+-            <env key="LANG" value="C"/>
+-            <arg value="info"/>
+-            <arg value="--xml"/>
+-            <arg value="."/>
+-        </exec>
+-        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+-        <delete file="REVISION"/>
+         <jar destfile="${plugin.jar}" basedir="build">
+             <manifest>
+                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.agpifoj.AgpifojPlugin" />


Property changes on: packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/josm-plugins/trunk/debian/patches/80_measurement.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/80_measurement.dpatch	                        (rev 0)
+++ packages/josm-plugins/trunk/debian/patches/80_measurement.dpatch	2009-02-16 10:13:35 UTC (rev 1894)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80_measurement.dpatch by  <g.mascellani at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/measurement/build.xml trunk/measurement/build.xml
+--- trunk~/measurement/build.xml	2009-01-01 18:55:45.000000000 +0100
++++ trunk/measurement/build.xml	2009-02-16 10:57:20.000000000 +0100
+@@ -20,14 +20,6 @@
+         <copy todir="build/images">
+             <fileset dir="images" />
+         </copy>
+-        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+-            <env key="LANG" value="C"/>
+-            <arg value="info"/>
+-            <arg value="--xml"/>
+-            <arg value="."/>
+-        </exec>
+-        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+-        <delete file="REVISION"/>
+         <jar destfile="${plugin.jar}" basedir="build">
+             <manifest>
+                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.measurement.MeasurementPlugin" />


Property changes on: packages/josm-plugins/trunk/debian/patches/80_measurement.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/josm-plugins/trunk/debian/patches/90_openvisible.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/90_openvisible.dpatch	                        (rev 0)
+++ packages/josm-plugins/trunk/debian/patches/90_openvisible.dpatch	2009-02-16 10:13:35 UTC (rev 1894)
@@ -0,0 +1,58 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_openvisible.dpatch by  <g.mascellani at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/openvisible/build.xml trunk/openvisible/build.xml
+--- trunk~/openvisible/build.xml	2009-01-01 18:55:45.000000000 +0100
++++ trunk/openvisible/build.xml	2009-02-16 11:10:19.000000000 +0100
+@@ -22,7 +22,7 @@
+     <property name="plugin.site.url" value="http://www.tegmento.org/~cdaller/josm/${ant.project.name}/"/>
+     <property name="plugin.site.upload.target" value="cdaller at www.tegmento.org:public_html/josm/${ant.project.name}/"/>
+     <property name="ant.build.javac.target" value="1.5"/>
+-    <target name="dist" depends="compile,site">
++    <target name="dist" depends="compile">
+ <!-- images -->
+         <copy todir="${plugin.build.dir}/images">
+             <fileset dir="images" />
+@@ -34,17 +34,8 @@
+        </fileset>
+      </copy>
+      -->
+-        <mkdir dir="${plugin.dist.dir}"/>
+-        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+-            <env key="LANG" value="C"/>
+-            <arg value="info"/>
+-            <arg value="--xml"/>
+-            <arg value="."/>
+-        </exec>
+-        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+-        <delete file="REVISION"/>
+ <!-- create jar file -->
+-        <jar destfile="${plugin.dist.dir}/${plugin.jar}" basedir="${plugin.build.dir}">
++        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+             <manifest>
+                 <attribute name="Plugin-Class" value="${plugin.class}" />
+                 <attribute name="Plugin-Description" value="${plugin.description}" />
+@@ -61,10 +52,7 @@
+         <mkdir dir="${plugin.build.dir}"/>
+         <javac srcdir="src" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
+             <classpath>
+-                <pathelement path="${josm.build.dir}/build"/>
+-                <fileset dir="${josm.build.dir}/lib">
+-                    <include name="**/*.jar"/>
+-                </fileset>
++                <pathelement path="${josm}"/>
+ <!--
+             <fileset dir="lib">
+               <include name="**/*.jar"/>
+@@ -136,6 +124,6 @@
+     <target name="clean">
+         <delete dir="${plugin.build.dir}" />
+         <delete dir="${plugin.site.file}" />
+-        <delete file="${plugin.dist.dir}/${plugin.jar}" />
++        <delete file="${plugin.jar}" />
+     </target>
+ </project>


Property changes on: packages/josm-plugins/trunk/debian/patches/90_openvisible.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/josm-plugins/trunk/debian/rules
===================================================================
--- packages/josm-plugins/trunk/debian/rules	2009-02-15 23:22:53 UTC (rev 1893)
+++ packages/josm-plugins/trunk/debian/rules	2009-02-16 10:13:35 UTC (rev 1894)
@@ -14,7 +14,7 @@
 DEB_ANT_CLEAN_TARGET := clean
 
 SVNREPO := http://svn.openstreetmap.org/applications/editors/josm/plugins/
-PLUGINS := colorscheme livegps slippymap utilsplugin validator wmsplugin
+PLUGINS := agpifoj colorscheme livegps measurement openvisible slippymap surveyor usertools utilsplugin validator wmsplugin
 
 DATE := $(shell date +%Y%m%d)
 ifdef SVNREV
@@ -32,7 +32,7 @@
 	@mkdir ${DESTDIR}
 	@for plugin in $(PLUGINS); do \
 			echo "Fetching $$plugin plugin"; \
-			svn export -r HEAD ${SVNREPO}/"$$plugin" ${DESTDIR}/"$$plugin"; \
+			svn export -r ${SVNREV} ${SVNREPO}/"$$plugin" ${DESTDIR}/"$$plugin"; \
 	done			
 	svn info --xml http://svn.openstreetmap.org/applications/editors/josm/plugins/ > ${DESTDIR}/svn-info.xml
 	@echo Removing jar files




More information about the Pkg-grass-devel mailing list