Author: nd-guest Date: 2008-04-07 21:05:08 +0000 (Mon, 07 Apr 2008) New Revision: 1504
Removed: packages/josm-plugins/trunk/debian/patches/100_ywms.dpatch packages/josm-plugins/trunk/debian/patches/10_build.dpatch packages/josm-plugins/trunk/debian/patches/20_validator.dpatch packages/josm-plugins/trunk/debian/patches/30_utilsplugin.dpatch packages/josm-plugins/trunk/debian/patches/40_wmsplugin.dpatch packages/josm-plugins/trunk/debian/patches/50_livegps.dpatch packages/josm-plugins/trunk/debian/patches/60_lang.dpatch packages/josm-plugins/trunk/debian/patches/70_namefinder.dpatch packages/josm-plugins/trunk/debian/patches/80_colorscheme.dpatch packages/josm-plugins/trunk/debian/patches/90_slippymap.dpatch Log: Remove old patches. Deleted: packages/josm-plugins/trunk/debian/patches/100_ywms.dpatch =================================================================== --- packages/josm-plugins/trunk/debian/patches/100_ywms.dpatch 2008-04-07 21:03:38 UTC (rev 1503) +++ packages/josm-plugins/trunk/debian/patches/100_ywms.dpatch 2008-04-07 21:05:08 UTC (rev 1504) @@ -1,41 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 100_ywms.dpatch by Andreas Putzo <[EMAIL PROTECTED]> -## -## DP: Patch for plugin ywms - [EMAIL PROTECTED]@ -diff -urNad josm-plugins-0.0.0.20080320~/ywms/build.xml josm-plugins-0.0.0.20080320/ywms/build.xml ---- josm-plugins-0.0.0.20080320~/ywms/build.xml 2008-03-30 20:17:32.000000000 +0200 -+++ josm-plugins-0.0.0.20080320/ywms/build.xml 2008-03-30 20:18:40.000000000 +0200 -@@ -1,13 +1,10 @@ - <project name="ywms" 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"/> - - <property name="ant.build.javac.target" value="1.5"/> - -@@ -28,14 +25,7 @@ - <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"/> -+ <xmlproperty file="${svn.info}" prefix="version" keepRoot="false" collapseAttributes="true"/> - <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}"> - <manifest> - <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.ywms.YWMSPlugin"/> Deleted: packages/josm-plugins/trunk/debian/patches/10_build.dpatch =================================================================== --- packages/josm-plugins/trunk/debian/patches/10_build.dpatch 2008-04-07 21:03:38 UTC (rev 1503) +++ packages/josm-plugins/trunk/debian/patches/10_build.dpatch 2008-04-07 21:05:08 UTC (rev 1504) @@ -1,89 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_build.dpatch by <[EMAIL PROTECTED]> -## -## DP: Patch for the main build.xml - [EMAIL PROTECTED]@ -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-30 13:41:54.000000000 +0000 -@@ -1,43 +1,49 @@ - <project name="josm-plugins" default="build" basedir="."> - -+ <property name="josm" location="/usr/share/josm/josm.jar" /> -+ <property name="plugin.dist.dir" location="dist" /> -+ <property name="ant.build.javac.target" value="1.5"/> -+ <property name="svn.info" location="svn-info.xml" /> - -+<!-- Not used in Debian - <target name="compile_josm"> - <ant dir="../core" target="dist" /> - </target> - - <target name="compile" depends="compile_josm"> - </target> -+--> - - <target name="build" depends="dist"> - </target> - -- <target name="dist" depends="compile"> -- <mkdir dir="../dist"/> -- <ant dir="colorscheme" antfile="build.xml" target="dist"/> -- <!--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="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="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="utilsplugin" antfile="build.xml" target="dist"/> - <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="livegps" 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"> -- <ant dir="lakewalker" antfile="build.xml" target="dist"/> -+ <target name="build_defect"> -+ <!--<ant dir="lakewalker" antfile="build.xml" target="dist"/> - <ant dir="navigator" antfile="build.xml" target="dist"/> - <ant dir="pluginmanager" antfile="build.xml" target="dist"/> - <ant dir="waypoints" antfile="build.xml" target="dist"/> -- <ant dir="grid" antfile="build.xml" target="dist"/> -+ <ant dir="grid" antfile="build.xml" target="dist"/>--> - </target> - - <target name="clean"> -@@ -63,12 +69,16 @@ - - <ant dir="surveyor" antfile="build.xml" target="clean"/> - <ant dir="livegps" antfile="build.xml" target="clean"/> -+ -+ <delete dir="${plugin.dist.dir}"/> - </target> - -+<!-- Not used in Debian - <target name="clean_install"> - </target> - - <target name="install" depends="dist"> - </target> -+--> - - </project> Deleted: packages/josm-plugins/trunk/debian/patches/20_validator.dpatch =================================================================== --- packages/josm-plugins/trunk/debian/patches/20_validator.dpatch 2008-04-07 21:03:38 UTC (rev 1503) +++ packages/josm-plugins/trunk/debian/patches/20_validator.dpatch 2008-04-07 21:05:08 UTC (rev 1504) @@ -1,83 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_build.dpatch by <[EMAIL PROTECTED]> -## -## DP: Patch for plugin validator - [EMAIL PROTECTED]@ -diff -urNad josm-plugins-0.0.0.20080316~/validator/build.xml josm-plugins-0.0.0.20080316/validator/build.xml ---- josm-plugins-0.0.0.20080316~/validator/build.xml 2008-03-16 15:45:08.000000000 +0100 -+++ josm-plugins-0.0.0.20080316/validator/build.xml 2008-03-16 15:50:39.000000000 +0100 -@@ -1,41 +1,48 @@ - <project name="validator" default="dist" basedir="."> - - <!-- compilation properties --> -+<!-- Not used in Debian - <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.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"/> - - <!-- point to your JOSM directory --> -+<!-- Not used in Debian - <property name="josm" location="../../core/dist/josm-custom.jar" /> -+--> - - <property name="ant.build.javac.target" value="1.5"/> - - <target name="init"> -- <mkdir dir="${plugin.build.dir}"/> -+ <mkdir dir="build"/> - </target> - - <target name="compile" depends="init"> - <javac srcdir="src" classpath="${josm}" destdir="build" debug="true"> -- <include name="**/*.java" /> -+<!-- <include name="**/*.java" /> --> - </javac> - </target> - -- <target name="dist" depends="clean, compile"> -+ <target name="dist" depends="compile"> - <copy todir="build/images"> - <fileset dir="images"/> - </copy> -+<!-- Not used in Debian - <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false"> - <env key="LANG" value="C"/> - <arg value="info"/> -- <arg value="--xml"/> -+ <arg value="-xml"/> Add another - - <arg value="."/> - </exec> - <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/> - <delete file="REVISION"/> -+--> -+ <xmlproperty file="${svn.info}" prefix="version" keepRoot="false" collapseAttributes="true"/> - <jar destfile="${plugin.jar}" basedir="build"> - <manifest> - <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin"/> -@@ -49,10 +56,11 @@ - - <!-- clean target --> - <target name="clean"> -- <delete dir="${plugin.build.dir}" /> -+ <delete dir="build" /> - <delete file="${plugin.jar}" /> - </target> - -+<!-- Not used in Debian - <target name="install" depends="dist"> - <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/> - </target> -@@ -61,5 +69,6 @@ - <java jar="${josm}" fork="true"> - </java> - </target> -+--> - - </project> Deleted: packages/josm-plugins/trunk/debian/patches/30_utilsplugin.dpatch =================================================================== --- packages/josm-plugins/trunk/debian/patches/30_utilsplugin.dpatch 2008-04-07 21:03:38 UTC (rev 1503) +++ packages/josm-plugins/trunk/debian/patches/30_utilsplugin.dpatch 2008-04-07 21:05:08 UTC (rev 1504) @@ -1,61 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_build.dpatch by <[EMAIL PROTECTED]> -## -## DP: Patch for plugin utilsplugin - [EMAIL PROTECTED]@ -diff -urNad josm-plugins-0.0.0.20080311~/utilsplugin/build.xml josm-plugins-0.0.0.20080311/utilsplugin/build.xml ---- josm-plugins-0.0.0.20080311~/utilsplugin/build.xml 2008-03-16 11:24:34.000000000 +0100 -+++ josm-plugins-0.0.0.20080311/utilsplugin/build.xml 2008-03-16 11:24:50.000000000 +0100 -@@ -1,21 +1,25 @@ - <project name="utilsplugin" 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 --> -+<!-- 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="../../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"/> - - <property name="ant.build.javac.target" value="1.5"/> - -@@ -27,7 +31,7 @@ - <javac srcdir="src" classpath="${josm}" destdir="build" debug="true"/> - </target> - -- <target name="dist" depends="clean, compile"> -+ <target name="dist" depends="compile"> - <copy todir="build/images"> - <fileset dir="images"/> - </copy> -@@ -43,11 +47,14 @@ - </target> - - <target name="clean"> -- <delete dir="${plugin.build.dir}" /> -+ <delete dir="build" /> - <delete file="${plugin.jar}" /> - </target> - -+<!-- Not used in Debian - <target name="install" depends="dist"> - <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/> - </target> -+--> -+ - </project> Deleted: packages/josm-plugins/trunk/debian/patches/40_wmsplugin.dpatch =================================================================== --- packages/josm-plugins/trunk/debian/patches/40_wmsplugin.dpatch 2008-04-07 21:03:38 UTC (rev 1503) +++ packages/josm-plugins/trunk/debian/patches/40_wmsplugin.dpatch 2008-04-07 21:05:08 UTC (rev 1504) @@ -1,65 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 40_wmsplugin.dpatch by <[EMAIL PROTECTED]> -## -## DP: Patch for plugin wmsplugin - [EMAIL PROTECTED]@ -diff -urNad josm-plugins-0.0.0.20080316~/wmsplugin/build.xml josm-plugins-0.0.0.20080316/wmsplugin/build.xml ---- josm-plugins-0.0.0.20080316~/wmsplugin/build.xml 2008-02-04 15:18:27.000000000 +0100 -+++ josm-plugins-0.0.0.20080316/wmsplugin/build.xml 2008-03-16 22:18:42.000000000 +0100 -@@ -1,32 +1,36 @@ - <project name="wmsplugin" 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 --> -+<!-- 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="../../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"/> - - <property name="ant.build.javac.target" value="1.5"/> - - <target name="init"> - <mkdir dir="build"></mkdir> -- <mkdir dir="dist"></mkdir> -+<!-- <mkdir dir="dist"></mkdir>--> - </target> - - <target name="compile" depends="init"> - <javac srcdir="src" classpath="${josm}" debug="true" destdir="build"> -- <include name="**/*.java" /> -+<!-- <include name="**/*.java" />--> - </javac> - </target> - -@@ -44,12 +48,14 @@ - </target> - - <target name="clean"> -- <delete dir="${plugin.build.dir}" /> -+ <delete dir="build" /> - <delete file="${plugin.jar}" /> - </target> - -+<!-- Not used in Debian - <target name="install" depends="dist"> - <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/> - </target> -+--> - - </project> Deleted: packages/josm-plugins/trunk/debian/patches/50_livegps.dpatch =================================================================== --- packages/josm-plugins/trunk/debian/patches/50_livegps.dpatch 2008-04-07 21:03:38 UTC (rev 1503) +++ packages/josm-plugins/trunk/debian/patches/50_livegps.dpatch 2008-04-07 21:05:08 UTC (rev 1504) @@ -1,164 +0,0 @@ -#! /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> Deleted: packages/josm-plugins/trunk/debian/patches/60_lang.dpatch =================================================================== --- packages/josm-plugins/trunk/debian/patches/60_lang.dpatch 2008-04-07 21:03:38 UTC (rev 1503) +++ packages/josm-plugins/trunk/debian/patches/60_lang.dpatch 2008-04-07 21:05:08 UTC (rev 1504) @@ -1,94 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 60_lang.dpatch by <[EMAIL PROTECTED]> -## -## DP: Patch for plugins lang-* - [EMAIL PROTECTED]@ -diff -urNad josm-plugins-0.0.0.20080320~/lang/build.xml josm-plugins-0.0.0.20080320/lang/build.xml ---- josm-plugins-0.0.0.20080320~/lang/build.xml 2008-03-22 14:08:40.000000000 +0100 -+++ josm-plugins-0.0.0.20080320/lang/build.xml 2008-03-22 14:19:27.000000000 +0100 -@@ -1,20 +1,22 @@ - <project name="lang" default="install-all" basedir="."> - - <!-- compilation properties --> -+<!-- Not used in Debian - <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.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"/>--> - - <property name="ant.build.javac.target" value="1.5"/> - - <target name="dist" depends="install-all"> - </target> - -- <target name="install-all" depends="josm-build,keys.pot"> -+ <target name="install-all"> - <ant target="install"><property name="language" value="de"/></ant> - <ant target="install"><property name="language" value="fr"/></ant> - <ant target="install"><property name="language" value="ro"/></ant> -@@ -23,8 +25,14 @@ - - <target name="install"> - <mkdir dir="${language}/build"/> -- <mkdir dir="../../dist"/> -- <javac srcdir="${language}/src" classpath="${josm.build.dir}/dist/josm-custom.jar" destdir="${language}/build" /> -+<!-- <mkdir dir="../../dist"/>--> -+ -+ <javac srcdir="${language}/src" destdir="${language}/build"> -+ <classpath> -+ <pathelement path="${josm}" /> -+ <pathelement path="/usr/share/java/gettext-commons.jar" /> -+ </classpath> -+ </javac> - - <exec executable="msgmerge"> - <arg line="-U ${language}/${language}.po keys.pot"/> -@@ -36,7 +44,7 @@ - - <copy file="i18n.properties" todir="${language}/build/org/openstreetmap/josm" /> - -- <jar destfile="../../dist/lang-${language}.jar" basedir="${language}/build"> -+ <jar destfile="${plugin.dist.dir}/lang-${language}.jar" basedir="${language}/build"> - <manifest> - <attribute name="Plugin-Class" value="org.openstreetmap.josm.TranslationLoader_${language}" /> - <attribute name="Plugin-Description" value="Translation to locale ${language}" /> -@@ -46,7 +54,7 @@ - </target> - - -- -+<!-- Not used in Debian - <target name="josm-build"> - <ant dir="${josm.build.dir}" /> - </target> -@@ -57,20 +65,21 @@ - </exec> - - <exec executable="xgettext"> -- <arg line="-ktr -ktrn:1,2 -ktrc -kmarktr -Ljava --from-code=UTF-8 -okeys.pot -falljava.txt"/> -+ <arg line="-ktr -ktrn:1,2 -ktrc -kmarktr -Ljava -from-code=UTF-8 -okeys.pot -falljava.txt"/> Add another - - </exec> - </target> -+--> - - <target name="clean"> - <ant target="clean_lang"><property name="language" value="de"/></ant> - <ant target="clean_lang"><property name="language" value="fr"/></ant> - <ant target="clean_lang"><property name="language" value="ro"/></ant> - <ant target="clean_lang"><property name="language" value="en_GB"/></ant> -- <delete dir="${plugin.build.dir}" /> -+<!-- <delete dir="${plugin.build.dir}" />--> - </target> - - <target name="clean_lang"> -- <delete file="../../dist/lang-${language}.jar" /> -+ <delete file="${plugin.dist.dir}/lang-${language}.jar" /> - <delete dir="${language}/build"/> - </target> - Deleted: packages/josm-plugins/trunk/debian/patches/70_namefinder.dpatch =================================================================== --- packages/josm-plugins/trunk/debian/patches/70_namefinder.dpatch 2008-04-07 21:03:38 UTC (rev 1503) +++ packages/josm-plugins/trunk/debian/patches/70_namefinder.dpatch 2008-04-07 21:05:08 UTC (rev 1504) @@ -1,74 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 70_namefinder.dpatch by <[EMAIL PROTECTED]> -## -## DP: Patch for plugin namefinder - [EMAIL PROTECTED]@ -diff -urNad josm-plugins-0.0.0.20080320~/namefinder/build.xml josm-plugins-0.0.0.20080320/namefinder/build.xml ---- josm-plugins-0.0.0.20080320~/namefinder/build.xml 2007-12-19 19:09:31.000000000 +0100 -+++ josm-plugins-0.0.0.20080320/namefinder/build.xml 2008-03-23 11:18:18.000000000 +0100 -@@ -1,30 +1,33 @@ - <project name="namefinder" default="dist" basedir="."> - - <!-- compilation properties --> -+<!-- Not used in Debian - <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.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"/> - - <property name="ant.build.javac.target" value="1.5"/> - - <!-- init target --> - <target name="init"> -- <mkdir dir="${plugin.build.dir}" /> -+ <mkdir dir="build" /> - </target> - - <!-- clean target --> - <target name="clean"> -- <delete dir="${plugin.build.dir}" /> -+ <delete dir="build" /> - <delete file="${plugin.jar}" /> - </target> - - <!-- compile target --> - <target name="compile" depends="init"> -- <javac srcdir="namefinder" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5"> -+ <javac srcdir="namefinder" destdir="build" debug="true" source="1.5" target="1.5" classpath="${josm}"> -+<!-- Not used in Debian - <classpath> - <pathelement path="${josm.build.dir}/build"/> - <pathelement path="${josm.build.dir}/src"/> -@@ -32,12 +35,13 @@ - <include name="**/*.jar"/> - </fileset> - </classpath> -+--> - </javac> - </target> - - <!-- dist target - create jar file --> - <target name="dist" depends="compile"> -- <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}"> -+ <jar destfile="${plugin.jar}" basedir="build"> - <manifest> - <attribute name="Plugin-Class" value="namefinder.NameFinderPlugin" /> - <attribute name="Plugin-Description" value="Allows selection of download areas by name, using an external service" /> -@@ -47,9 +51,11 @@ - </target> - - <!-- install target - copy jar file to plugin destination --> -+<!-- Not used in Debian - <target name="install" depends="dist"> - <copy file="../../dist/${ant.project.name}.jar" todir="${josm.home.dir}/plugins" /> - </target> -+--> - - </project> - Deleted: packages/josm-plugins/trunk/debian/patches/80_colorscheme.dpatch =================================================================== --- packages/josm-plugins/trunk/debian/patches/80_colorscheme.dpatch 2008-04-07 21:03:38 UTC (rev 1503) +++ packages/josm-plugins/trunk/debian/patches/80_colorscheme.dpatch 2008-04-07 21:05:08 UTC (rev 1504) @@ -1,47 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 80_colorscheme.dpatch by Andreas Putzo <[EMAIL PROTECTED]> -## -## DP: Patch for plugin colorscheme - [EMAIL PROTECTED]@ -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> - Deleted: packages/josm-plugins/trunk/debian/patches/90_slippymap.dpatch =================================================================== --- packages/josm-plugins/trunk/debian/patches/90_slippymap.dpatch 2008-04-07 21:03:38 UTC (rev 1503) +++ packages/josm-plugins/trunk/debian/patches/90_slippymap.dpatch 2008-04-07 21:05:08 UTC (rev 1504) @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 90_slippymap.dpatch by Andreas Putzo <[EMAIL PROTECTED]> -## -## DP: Patch for plugin slippymap - [EMAIL PROTECTED]@ -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"/> - _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel