Author: gmascellani-guest
Date: 2009-02-15 19:07:30 +0000 (Sun, 15 Feb 2009)
New Revision: 1889

Added:
   packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch
   packages/josm-plugins/trunk/debian/patches/20_livegps.dpatch
   packages/josm-plugins/trunk/debian/patches/30_slippymap.dpatch
   packages/josm-plugins/trunk/debian/patches/40_utilsplugin.dpatch
   packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
   packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch
Removed:
   packages/josm-plugins/trunk/debian/patches/10_validator.dpatch
   packages/josm-plugins/trunk/debian/patches/20_disable_svn.dpatch
   packages/josm-plugins/trunk/debian/patches/30_build.dpatch
Modified:
   packages/josm-plugins/trunk/debian/patches/00list
Log:
Patches updated to last SVN release


Modified: packages/josm-plugins/trunk/debian/patches/00list
===================================================================
--- packages/josm-plugins/trunk/debian/patches/00list   2009-02-15 19:05:56 UTC 
(rev 1888)
+++ packages/josm-plugins/trunk/debian/patches/00list   2009-02-15 19:07:30 UTC 
(rev 1889)
@@ -1,3 +1,6 @@
-10_validator
-20_disable_svn
-30_build
+10_colorscheme
+20_livegps
+30_slippymap
+40_utilsplugin
+50_validator
+60_wmsplugin

Added: packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch            
                (rev 0)
+++ packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch    
2009-02-15 19:07:30 UTC (rev 1889)
@@ -0,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_colorscheme.dpatch by  <g.mascell...@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+...@dpatch@
+diff -urNad trunk~/colorscheme/build.xml trunk/colorscheme/build.xml
+--- trunk~/colorscheme/build.xml       2009-01-01 18:55:45.000000000 +0100
++++ trunk/colorscheme/build.xml        2009-02-15 19:57:22.000000000 +0100
+@@ -15,7 +15,7 @@
+     <property name="plugin.site.url" 
value="http://www.tegmento.org/~cdaller/josm/colorscheme/"/>
+     <property name="plugin.site.upload.target" 
value="cdal...@www.tegmento.org:public_html/josm/colorscheme/"/>
+     <property name="ant.build.javac.target" value="1.5"/>
+-    <target name="dist" depends="compile, site">
++    <target name="dist" depends="compile">
+         <echo message="creating ${plugin.jar}"/>
+ <!-- images -->
+ <!--
+@@ -29,14 +29,6 @@
+                 <include name="*.xml"/>
+             </fileset>
+         </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"/>
+ <!-- create jar file -->
+         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+             <manifest>
+@@ -48,14 +40,11 @@
+             </manifest>
+         </jar>
+     </target>
+-    <target name="compile" depends="init">
++    <target name="compile" depends="">
+         <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}"/>
+             </classpath>
+         </javac>
+     </target>


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

Deleted: packages/josm-plugins/trunk/debian/patches/10_validator.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/10_validator.dpatch      
2009-02-15 19:05:56 UTC (rev 1888)
+++ packages/josm-plugins/trunk/debian/patches/10_validator.dpatch      
2009-02-15 19:07:30 UTC (rev 1889)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 21_validator.dpatch by Andreas Putzo <andr...@putzo.net>
-##
-## DP: Add cast operator for OsmPrimitive.
-## DP: This is necessary to compile with gcj.
-
-...@dpatch@
-diff -urNad 
josm-plugins-0.0.0.20080326~/validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java
 
josm-plugins-0.0.0.20080326/validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java
---- 
josm-plugins-0.0.0.20080326~/validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java
  2008-01-14 11:16:12.000000000 +0000
-+++ 
josm-plugins-0.0.0.20080326/validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java
   2008-03-27 18:26:55.000000000 +0000
-@@ -504,7 +504,7 @@
-                               String key = prop.getKey();
-                               String value = prop.getValue();
-                               if( value == null || value.trim().length() == 0 
)
--                                      commands.add( new 
ChangePropertyCommand(Collections.singleton(primitives.get(i)), key, null) );
-+                                      commands.add( new 
ChangePropertyCommand(Collections.singleton((OsmPrimitive)primitives.get(i)), 
key, null) );
-                               else
-                               {
-                                       String replacementKey = 
spellCheckKeyData.get(key);

Deleted: packages/josm-plugins/trunk/debian/patches/20_disable_svn.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/20_disable_svn.dpatch    
2009-02-15 19:05:56 UTC (rev 1888)
+++ packages/josm-plugins/trunk/debian/patches/20_disable_svn.dpatch    
2009-02-15 19:07:30 UTC (rev 1889)
@@ -1,61 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_disable_svn.dpatch by Andreas Putzo <andr...@putzo.net>
-##
-## DP: The validator and ywms plugins try to execute the svn command during 
build.
-## DP: This patch disables this behaviour.
-
-...@dpatch@
-diff -urNad josm-plugins-0.0.0.20080518~/slippymap/build.xml 
josm-plugins-0.0.0.20080518/slippymap/build.xml
---- josm-plugins-0.0.0.20080518~/slippymap/build.xml   2008-05-14 
17:40:22.000000000 +0200
-+++ josm-plugins-0.0.0.20080518/slippymap/build.xml    2008-06-30 
19:46:28.000000000 +0200
-@@ -26,14 +26,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"/>
-     
-     <!-- create josm-custom.jar -->
-     <jar destfile="${plugin.jar}" basedir="build">
-diff -urNad josm-plugins-0.0.0.20080518~/validator/build.xml 
josm-plugins-0.0.0.20080518/validator/build.xml
---- josm-plugins-0.0.0.20080518~/validator/build.xml   2008-06-30 
19:42:26.000000000 +0200
-+++ josm-plugins-0.0.0.20080518/validator/build.xml    2008-06-30 
19:45:22.000000000 +0200
-@@ -29,14 +29,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.validator.OSMValidatorPlugin"/>
-diff -urNad josm-plugins-0.0.0.20080518~/ywms/build.xml 
josm-plugins-0.0.0.20080518/ywms/build.xml
---- josm-plugins-0.0.0.20080518~/ywms/build.xml        2008-06-30 
19:42:26.000000000 +0200
-+++ josm-plugins-0.0.0.20080518/ywms/build.xml 2008-06-30 19:45:22.000000000 
+0200
-@@ -29,14 +29,6 @@
-     <copy todir="${plugin.build.dir}/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="${plugin.build.dir}">
-       <manifest>
-       <attribute name="Plugin-Class" 
value="org.openstreetmap.josm.plugins.ywms.YWMSPlugin"/>

Added: packages/josm-plugins/trunk/debian/patches/20_livegps.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/20_livegps.dpatch                
                (rev 0)
+++ packages/josm-plugins/trunk/debian/patches/20_livegps.dpatch        
2009-02-15 19:07:30 UTC (rev 1889)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_livegps.dpatch by  <g.mascell...@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+...@dpatch@
+diff -urNad trunk~/livegps/build.xml trunk/livegps/build.xml
+--- trunk~/livegps/build.xml   2009-01-01 18:55:45.000000000 +0100
++++ trunk/livegps/build.xml    2009-02-15 19:58:35.000000000 +0100
+@@ -35,14 +35,6 @@
+         <copy todir="${plugin.build.dir}/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"/>
+ <!-- create jar file -->
+         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
+             <manifest>
+@@ -60,12 +52,7 @@
+         <javac srcdir="livegps" destdir="${plugin.build.dir}" debug="true" 
source="1.5" target="1.5">
+             <compilerarg value="-Xlint:deprecation"/>
+             <classpath>
+-                <pathelement path="${josm.build.dir}/build"/>
+-                <fileset dir="${josm.build.dir}/lib">
+-                    <include name="../core/build/josm.jar"/>
+-                    <include name="**/*.jar"/>
+-                </fileset>
+-                <pathelement location="${plugin.jar}"/>
++                <pathelement location="${josm}"/>
+             </classpath>
+         </javac>
+     </target>


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

Deleted: packages/josm-plugins/trunk/debian/patches/30_build.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/30_build.dpatch  2009-02-15 
19:05:56 UTC (rev 1888)
+++ packages/josm-plugins/trunk/debian/patches/30_build.dpatch  2009-02-15 
19:07:30 UTC (rev 1889)
@@ -1,43 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_build.dpatch by Andreas Putzo <andr...@putzo.net>
-##
-## DP: Fix mistake in clean targets of the colorscheme and livegps plugin
-## DP: and in compile target of the slippy_map_chooser plugin.
-
-...@dpatch@
-diff -urNad josm-plugins-0.0.0.20080518~/colorscheme/build.xml 
josm-plugins-0.0.0.20080518/colorscheme/build.xml
---- josm-plugins-0.0.0.20080518~/colorscheme/build.xml 2008-04-06 
21:10:11.000000000 +0200
-+++ josm-plugins-0.0.0.20080518/colorscheme/build.xml  2008-05-18 
16:09:07.000000000 +0200
-@@ -69,7 +69,7 @@
-   </target>
- 
-   <target name="clean">
--    <delete dir="${plugin.site.file}" />
-+    <delete file="${plugin.site.file}" />
-     <delete dir="${plugin.build.dir}" />
-     <delete file="${plugin.jar}" />
-   </target>
-diff -urNad josm-plugins-0.0.0.20080518~/livegps/build.xml 
josm-plugins-0.0.0.20080518/livegps/build.xml
---- josm-plugins-0.0.0.20080518~/livegps/build.xml     2008-04-06 
21:10:11.000000000 +0200
-+++ josm-plugins-0.0.0.20080518/livegps/build.xml      2008-05-18 
16:09:07.000000000 +0200
-@@ -79,7 +79,7 @@
- 
-   <target name="clean">
-     <delete dir="${plugin.build.dir}" />
--    <delete dir="${plugin.site.file}" />
-+    <delete file="${plugin.site.file}" />
-     <delete file="${plugin.jar}" />
-   </target>
- 
-diff -urNad josm-plugins-0.0.0.20080518~/slippy_map_chooser/build.xml 
josm-plugins-0.0.0.20080518/slippy_map_chooser/build.xml
---- josm-plugins-0.0.0.20080518~/slippy_map_chooser/build.xml  2008-04-06 
21:10:11.000000000 +0200
-+++ josm-plugins-0.0.0.20080518/slippy_map_chooser/build.xml   2008-05-18 
16:09:39.000000000 +0200
-@@ -38,7 +38,7 @@
- 
-   <target name="compile" depends="init">
-     <echo message="creating ${plugin.jar}"/>
--    <javac srcdir="src" classpath="../../core/dist/josm-custom.jar" 
destdir="build" />
-+    <javac srcdir="src" classpath="${josm}" destdir="build" />
-   </target>
-   
-   <target name="init">

Added: packages/josm-plugins/trunk/debian/patches/30_slippymap.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/30_slippymap.dpatch              
                (rev 0)
+++ packages/josm-plugins/trunk/debian/patches/30_slippymap.dpatch      
2009-02-15 19:07:30 UTC (rev 1889)
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_slippymap.dpatch by  <g.mascell...@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+...@dpatch@
+diff -urNad trunk~/slippymap/build.xml trunk/slippymap/build.xml
+--- trunk~/slippymap/build.xml 2009-01-01 18:55:45.000000000 +0100
++++ trunk/slippymap/build.xml  2009-02-15 19:59:59.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"/>
+ <!-- create josm-custom.jar -->
+         <jar destfile="${plugin.jar}" basedir="build">
+             <manifest>
+@@ -41,7 +33,7 @@
+     </target>
+     <target name="compile" depends="init">
+         <echo message="creating ${plugin.jar}"/>
+-        <javac srcdir="src" classpath="../../core/dist/josm-custom.jar" 
destdir="build">
++        <javac srcdir="src" classpath="${josm}" destdir="build">
+             <compilerarg value="-Xlint:deprecation"/>
+         </javac>
+     </target>


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

Added: packages/josm-plugins/trunk/debian/patches/40_utilsplugin.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/40_utilsplugin.dpatch            
                (rev 0)
+++ packages/josm-plugins/trunk/debian/patches/40_utilsplugin.dpatch    
2009-02-15 19:07:30 UTC (rev 1889)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_utilsplugin.dpatch by  <g.mascell...@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+...@dpatch@
+diff -urNad trunk~/utilsplugin/build.xml trunk/utilsplugin/build.xml
+--- trunk~/utilsplugin/build.xml       2009-02-14 13:34:22.000000000 +0100
++++ trunk/utilsplugin/build.xml        2009-02-15 20:01:14.000000000 +0100
+@@ -18,14 +18,6 @@
+         <copy todir="${plugin.build.dir}/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="${plugin.build.dir}">
+             <manifest>
+                 <attribute name="Plugin-Class" 
value="UtilsPlugin.UtilsPlugin"/>


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

Added: packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/50_validator.dpatch              
                (rev 0)
+++ packages/josm-plugins/trunk/debian/patches/50_validator.dpatch      
2009-02-15 19:07:30 UTC (rev 1889)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_validator.dpatch by  <g.mascell...@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+...@dpatch@
+diff -urNad trunk~/validator/build.xml trunk/validator/build.xml
+--- trunk~/validator/build.xml 2009-01-23 22:36:04.000000000 +0100
++++ trunk/validator/build.xml  2009-02-15 20:02:13.000000000 +0100
+@@ -19,14 +19,6 @@
+         <copy todir="${plugin.build.dir}/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="${plugin.build.dir}">
+             <manifest>
+                 <attribute name="Plugin-Class" 
value="org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin"/>


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

Added: packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch              
                (rev 0)
+++ packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch      
2009-02-15 19:07:30 UTC (rev 1889)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60_wmsplugin.dpatch by  <g.mascell...@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+...@dpatch@
+diff -urNad trunk~/wmsplugin/build.xml trunk/wmsplugin/build.xml
+--- trunk~/wmsplugin/build.xml 2009-02-08 11:38:00.000000000 +0100
++++ trunk/wmsplugin/build.xml  2009-02-15 20:04:02.000000000 +0100
+@@ -22,14 +22,6 @@
+         <copy todir="${plugin.build.dir}/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="${plugin.build.dir}">
+             <manifest>
+                 <attribute name="Plugin-Class" value="wmsplugin.WMSPlugin" />


Property changes on: 
packages/josm-plugins/trunk/debian/patches/60_wmsplugin.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

Reply via email to