Author: gmascellani-guest
Date: 2008-03-20 21:07:20 +0000 (Thu, 20 Mar 2008)
New Revision: 1439
Added:
packages/josm-plugins/trunk/debian/patches/50_livegps.dpatch
Modified:
packages/josm-plugins/trunk/debian/control
packages/josm-plugins/trunk/debian/patches/00list
packages/josm-plugins/trunk/debian/patches/10_build.dpatch
Log:
Added support for livegps
Modified: packages/josm-plugins/trunk/debian/control
===================================================================
--- packages/josm-plugins/trunk/debian/control 2008-03-20 16:59:56 UTC (rev
1438)
+++ packages/josm-plugins/trunk/debian/control 2008-03-20 21:07:20 UTC (rev
1439)
@@ -10,6 +10,7 @@
Package: josm-plugins
Architecture: all
Depends: josm
+Suggests: gpsd
Description: JOSM plugins
JOSM (Java OpenStreetMap) plugin collection.
.
Modified: packages/josm-plugins/trunk/debian/patches/00list
===================================================================
--- packages/josm-plugins/trunk/debian/patches/00list 2008-03-20 16:59:56 UTC
(rev 1438)
+++ packages/josm-plugins/trunk/debian/patches/00list 2008-03-20 21:07:20 UTC
(rev 1439)
@@ -2,3 +2,4 @@
20_validator
30_utilsplugin
40_wmsplugin
+50_livegps
Modified: packages/josm-plugins/trunk/debian/patches/10_build.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/10_build.dpatch 2008-03-20
16:59:56 UTC (rev 1438)
+++ packages/josm-plugins/trunk/debian/patches/10_build.dpatch 2008-03-20
21:07:20 UTC (rev 1439)
@@ -4,9 +4,9 @@
## DP: Patch for the main build.xml
@DPATCH@
-diff -urNad josm-plugins-0.0.0.20080316~/build.xml
josm-plugins-0.0.0.20080316/build.xml
---- josm-plugins-0.0.0.20080316~/build.xml 2008-03-16 22:19:52.000000000
+0100
-+++ josm-plugins-0.0.0.20080316/build.xml 2008-03-16 22:20:25.000000000
+0100
+diff -urNad josm-plugins-0.0.0.20080320~/build.xml
josm-plugins-0.0.0.20080320/build.xml
+--- josm-plugins-0.0.0.20080320~/build.xml 2008-03-20 21:44:46.000000000
+0100
++++ josm-plugins-0.0.0.20080320/build.xml 2008-03-20 21:45:08.000000000
+0100
@@ -1,43 +1,49 @@
<project name="josm-plugins" default="build" basedir=".">
@@ -49,11 +49,11 @@
<ant dir="validator" antfile="build.xml" target="dist"/>
<ant dir="wmsplugin" antfile="build.xml" target="dist"/>
- <ant dir="ywms" antfile="build.xml" target="dist"/>
-+ <!-- <ant dir="ywms" antfile="build.xml" target="dist"/>
++ <!-- <ant dir="ywms" antfile="build.xml"
target="dist"/>-->
<ant dir="livegps" antfile="build.xml" target="dist"/>
- <ant dir="surveyor" antfile="build.xml" target="dist"/>
-+ <ant dir="surveyor" antfile="build.xml" target="dist"/>
-->
++ <!-- <ant dir="surveyor" antfile="build.xml" target="dist"/>
-->
</target>
- <target name="build_defect" depends="compile">
Added: packages/josm-plugins/trunk/debian/patches/50_livegps.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/50_livegps.dpatch
(rev 0)
+++ packages/josm-plugins/trunk/debian/patches/50_livegps.dpatch
2008-03-20 21:07:20 UTC (rev 1439)
@@ -0,0 +1,164 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_livegps.dpatch by <[EMAIL PROTECTED]>
+##
+## DP: Patch for plugin livegps
+
[EMAIL PROTECTED]@
+diff -urNad josm-plugins-0.0.0.20080320~/livegps/build.xml
josm-plugins-0.0.0.20080320/livegps/build.xml
+--- josm-plugins-0.0.0.20080320~/livegps/build.xml 2008-03-20
21:54:50.000000000 +0100
++++ josm-plugins-0.0.0.20080320/livegps/build.xml 2008-03-20
21:56:44.000000000 +0100
+@@ -1,26 +1,34 @@
+ <project name="livegps" default="dist" basedir=".">
+
+ <!-- josm "user home" directory depends on the platform used (windows has a
different place than unix/linux) -->
++<!-- Not used in Debian
+ <property environment="env"/>
+ <condition property="josm.home.dir" value="${env.APPDATA}/JOSM"
else="${user.home}/.josm">
+ <and>
+ <os family="windows"/>
+ </and>
+ </condition>
++-->
+
+ <!-- compilation properties -->
+ <!--<property name="josm.build.dir" value="../../JOSM/"/> -->
++<!-- Not used in Debian
+ <property name="josm.build.dir" value="../../core/"/>
+ <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
++-->
+ <!-- <property name="josm"
location="../../JOSM/dist/josm-custom.jar" /> -->
++<!-- Not used in Debian
+ <property name="josm"
location="../../core/dist/josm-custom.jar" />
+ <property name="plugin.build.dir" value="build"/>
+ <property name="plugin.dist.dir" value="../../dist"/>
++-->
+ <property name="plugin.name" value="${ant.project.name}"/>
+- <property name="plugin.jar" value="../../dist/${plugin.name}.jar"/>
++ <property name="plugin.jar"
value="${plugin.dist.dir}/${plugin.name}.jar"/>
+
++<!-- Not used in Debian
+ <property name="plugin.jar" value="../../dist/${plugin.name}.jar"/>
+ <property name="livegpsplugin.jar"
value="${josm.home.dir}/plugins/livegps.jar"/>
++-->
+
+ <!-- plugin meta data (enter new version number if anything changed!) -->
+ <property name="plugin.version" value="1.3"/>
+@@ -29,21 +37,23 @@
+ <property name="plugin.class" value="livegps.LiveGpsPlugin"/>
+
+ <!-- update site meta data -->
++<!-- Not used in Debian
+ <property name="plugin.site.file" value="josm-site.xml"/>
+ <property name="plugin.site.description" value="Josm's LiveGps Update
Site"/>
+ <property name="plugin.site.url"
value="http://www.tegmento.org/~cdaller/josm/livegps/"/>
+ <property name="plugin.site.upload.target" value="[EMAIL
PROTECTED]:public_html/josm/livegps/"/>
++-->
+
+ <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">
++ <copy todir="build/images">
+ <fileset dir="images" />
+ </copy>
+
+ <!-- create jar file -->
+- <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
++ <jar destfile="${plugin.jar}" basedir="build">
+ <manifest>
+ <attribute name="Plugin-Class" value="${plugin.class}" />
+ <attribute name="Plugin-Description" value="${plugin.description}" />
+@@ -55,8 +65,9 @@
+ </target>
+
+ <target name="compile" depends="init">
+- <mkdir dir="${plugin.build.dir}"/>
+- <javac srcdir="livegps" destdir="${plugin.build.dir}" debug="true"
source="1.5" target="1.5">
++<!-- <mkdir dir="${plugin.build.dir}"/>-->
++ <javac srcdir="livegps" destdir="build" debug="true" source="1.5"
target="1.5" classpath="${josm}">
++<!-- Not used in Debian
+ <classpath>
+ <pathelement path="${josm.build.dir}/build"/>
+ <fileset dir="${josm.build.dir}/lib">
+@@ -65,28 +76,33 @@
+ </fileset>
+ <pathelement location="${plugin.jar}"/>
+ </classpath>
++-->
+ </javac>
+ </target>
+
++<!-- Not used in Debian
+ <target name="install" depends="dist">
+ <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+ <copy file="liveGPS.conf" todir="${josm.plugins.dir}/livegps/" />
+ </target>
++-->
+
+ <target name="init">
+- <echo>java version: ${java.version}</echo>
++<!-- <echo>java version: ${java.version}</echo>-->
++ <mkdir dir="build" />
+ </target>
+
+ <target name="clean">
+- <delete dir="${plugin.build.dir}" />
+- <delete dir="${plugin.site.file}" />
++ <delete dir="build" />
++<!-- <delete dir="${plugin.site.file}" />-->
+ <delete file="${plugin.jar}" />
+ </target>
+
+ <!-- write site description for the given plugin so josm will accept it -->
++<!-- Not used in Debian
+ <target name="site">
+ <echo message="creating site description in ${plugin.site.file}"/>
+- <echo file="${plugin.site.file}"><!-- plugins available on this site
-->
++ <echo file="${plugin.site.file}"><!- plugins available on this site ->
Add other two -
+ <plugins>
+ <plugin id="${ant.project.name}" version="${plugin.version}">
+ <name>${ant.project.name}</name>
+@@ -96,19 +112,21 @@
+ </plugins>
+ </echo>
+ </target>
++-->
+
+ <!-- write site description for the given plugin (not implemented in JOSM as
full version yet!) -->
++<!-- Not used in Debian
+ <target name="site-full-donotuse">
+ <echo message="creating site description in ${plugin.site.file}"/>
+ <echo file="${plugin.site.file}"><?xml version="1.0"?>
+ <site version="1.0">
+- <!-- meta data of site -->
++ <!- meta data of site -> Add other two -
+ <site-info>
+ <site-name>${plugin.site.description}</site-name>
+ <site-url>${plugin.site.url}</site-url>
+ </site-info>
+
+-<!-- plugins available on this site -->
++<!- plugins available on this site -> Add other two -
+ <plugins>
+ <plugin id="${ant.project.name}" version="${plugin.version}">
+ <name>${ant.project.name}</name>
+@@ -122,8 +140,10 @@
+ </site>
+ </echo>
+ </target>
++-->
+
+ <!-- upload the site description and the jar file via ssh -->
++<!-- Not used in Debian
+ <target name="upload" depends="dist,site">
+ <echo message="uploading jar and site description to
${plugin.site.upload.target}"/>
+ <exec executable="scp">
+@@ -132,5 +152,6 @@
+ <arg value="${plugin.site.upload.target}"/>
+ </exec>
+ </target>
++-->
+
+ </project>
Property changes on:
packages/josm-plugins/trunk/debian/patches/50_livegps.dpatch
___________________________________________________________________
Name: svn:executable
+ *
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
