[DebianGIS-dev] r1475 - packages/josm-plugins/trunk/debian/patches

nd-guest at alioth.debian.org nd-guest at alioth.debian.org
Sat Mar 29 13:51:01 UTC 2008 

Author: nd-guest
Date: 2008-03-29 13:51:00 +0000 (Sat, 29 Mar 2008)
New Revision: 1475

Added:
   packages/josm-plugins/trunk/debian/patches/80_colorscheme.dpatch
   packages/josm-plugins/trunk/debian/patches/90_slippymap.dpatch
Modified:
   packages/josm-plugins/trunk/debian/patches/00list
   packages/josm-plugins/trunk/debian/patches/10_build.dpatch
Log:
Enable plugins: slippymap, colorscheme


Modified: packages/josm-plugins/trunk/debian/patches/00list
===================================================================
--- packages/josm-plugins/trunk/debian/patches/00list	2008-03-29 13:50:24 UTC (rev 1474)
+++ packages/josm-plugins/trunk/debian/patches/00list	2008-03-29 13:51:00 UTC (rev 1475)
@@ -6,3 +6,5 @@
 50_livegps
 60_lang
 70_namefinder
+80_colorscheme
+90_slippymap

Modified: packages/josm-plugins/trunk/debian/patches/10_build.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/10_build.dpatch	2008-03-29 13:50:24 UTC (rev 1474)
+++ packages/josm-plugins/trunk/debian/patches/10_build.dpatch	2008-03-29 13:51:00 UTC (rev 1475)
@@ -4,9 +4,9 @@
 ## DP: Patch for the main build.xml
 
 @DPATCH@
-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-22 14:24:19.000000000 +0100
-+++ josm-plugins-0.0.0.20080320/build.xml	2008-03-23 11:19:06.000000000 +0100
+diff -urNad josm-plugins-0.0.0.20080326~/build.xml josm-plugins-0.0.0.20080326/build.xml
+--- josm-plugins-0.0.0.20080326~/build.xml	2008-03-05 20:13:48.000000000 +0000
++++ josm-plugins-0.0.0.20080326/build.xml	2008-03-29 13:36:39.000000000 +0000
 @@ -1,43 +1,49 @@
  <project name="josm-plugins" default="build" basedir=".">
  
@@ -33,18 +33,21 @@
 -    <!--ant	dir="duplicateway"	antfile="build.xml"	target="dist"/ code still uses API 0.4 -->
 +  <target name="dist">
 +    <mkdir dir="${plugin.dist.dir}"/>
-+    <!-- <ant	dir="colorscheme"	antfile="build.xml"	target="dist"/> -->
++    <ant	dir="colorscheme"	antfile="build.xml"	target="dist"/> 
 +    <!-- <ant	dir="duplicateway"	antfile="build.xml"	target="dist"/ code still uses API 0.4 -->
      <ant	dir="lang"		antfile="build.xml"	target="dist"/>
      <ant	dir="namefinder"	antfile="build.xml"	target="dist"/>
 -    <ant	dir="nearclick"		antfile="build.xml"	target="dist"/>
-+    <!-- <ant	dir="nearclick"		antfile="build.xml"	target="dist"/>
-     <ant	dir="openvisible"	antfile="build.xml"	target="dist"/>
-     <ant	dir="osmarender"	antfile="build.xml"	target="dist"/>
-     <ant	dir="plastic_laf"	antfile="build.xml"	target="dist"/>
+-    <ant	dir="openvisible"	antfile="build.xml"	target="dist"/>
+-    <ant	dir="osmarender"	antfile="build.xml"	target="dist"/>
+-    <ant	dir="plastic_laf"	antfile="build.xml"	target="dist"/>
++    <!-- <ant	dir="nearclick"		antfile="build.xml"	target="dist"/> -->
++    <!-- <ant	dir="openvisible"	antfile="build.xml"	target="dist"/> -->
++    <!-- <ant	dir="osmarender"	antfile="build.xml"	target="dist"/> -->
++    <!-- <ant	dir="plastic_laf"	antfile="build.xml"	target="dist"/> -->
      <ant	dir="slippymap"		antfile="build.xml"	target="dist"/>
 -    <ant	dir="tagging-preset-tester"	antfile="build.xml"	target="dist"/>
-+    <ant	dir="tagging-preset-tester"	antfile="build.xml"	target="dist"/>-->
++    <!-- <ant	dir="tagging-preset-tester"	antfile="build.xml"	target="dist"/> -->
      <ant	dir="utilsplugin"	antfile="build.xml"	target="dist"/>
      <ant	dir="validator"		antfile="build.xml"	target="dist"/>
      <ant	dir="wmsplugin"		antfile="build.xml"	target="dist"/>

Added: packages/josm-plugins/trunk/debian/patches/80_colorscheme.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/80_colorscheme.dpatch	                        (rev 0)
+++ packages/josm-plugins/trunk/debian/patches/80_colorscheme.dpatch	2008-03-29 13:51:00 UTC (rev 1475)
@@ -0,0 +1,48 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80_colorscheme.dpatch by Andreas Putzo <andreas at putzo.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad josm-plugins-0.0.0.20080326~/colorscheme/build.xml josm-plugins-0.0.0.20080326/colorscheme/build.xml
+--- josm-plugins-0.0.0.20080326~/colorscheme/build.xml	2007-12-19 18:09:31.000000000 +0000
++++ josm-plugins-0.0.0.20080326/colorscheme/build.xml	2008-03-29 13:43:50.000000000 +0000
+@@ -1,13 +1,10 @@
+ <project name="colorscheme" default="dist" basedir=".">
+ 
+   <!-- compilation properties -->
+-  <property name="josm.build.dir"	value="../../core"/>
+-  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+-  <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.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="../dist/${plugin.name}.jar"/>
+   
+   <!-- plugin meta data (enter new version number if anything changed!) -->
+   <property name="plugin.version" value="0.5.2"/>
+@@ -22,7 +19,7 @@
+ 
+   <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">
+@@ -50,12 +47,6 @@
+   <target name="compile" depends="init">
+     <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>
+-      </classpath>
+     </javac>
+   </target>
+ 


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

Added: packages/josm-plugins/trunk/debian/patches/90_slippymap.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/90_slippymap.dpatch	                        (rev 0)
+++ packages/josm-plugins/trunk/debian/patches/90_slippymap.dpatch	2008-03-29 13:51:00 UTC (rev 1475)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_slippymap.dpatch by Andreas Putzo <andreas at putzo.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad josm-plugins-0.0.0.20080326~/slippymap/build.xml josm-plugins-0.0.0.20080326/slippymap/build.xml
+--- josm-plugins-0.0.0.20080326~/slippymap/build.xml	2007-12-19 18:09:31.000000000 +0000
++++ josm-plugins-0.0.0.20080326/slippymap/build.xml	2008-03-28 23:20:29.000000000 +0000
+@@ -14,9 +14,9 @@
+   <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
+   <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.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="../dist/${plugin.name}.jar"/>
+ 
+   <property name="ant.build.javac.target" value="1.5"/>
+   


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

More information about the Pkg-grass-devel mailing list