[Pkg-osm-commits] [SCM] josm-plugins branch, master, updated. debian/0.0.svn25935-1-15-g6d31e36

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit 2dc01ed57d8616049c210dfb30d79ec0cb16d488
Author: Giovanni Mascellani <gio at debian.org>
Date:   Sat Sep 10 11:44:25 2011 +0200

    Patching i18n/build.xml.

diff --git a/debian/patches/10-i18n-build.xml b/debian/patches/10-i18n-build.xml
new file mode 100644
index 0000000..a1607b6
--- /dev/null
+++ b/debian/patches/10-i18n-build.xml
@@ -0,0 +1,24 @@
+Index: josm-plugins/i18n/build.xml
+===================================================================
+--- josm-plugins.orig/i18n/build.xml	2011-09-10 11:45:34.000000000 +0200
++++ josm-plugins/i18n/build.xml	2011-09-10 11:56:31.000000000 +0200
+@@ -12,8 +12,8 @@
+     <property name="i18n.install.dir" value="${josm.build.dir}/data"/>
+     <property name="po.build.dir" value="${i18n.build.dir}"/>
+     <property name="ant.build.javac.target" value="1.5"/>
+-    <property name="gettexttasks.jar" value="lib/gettext-ant-tasks-0.9.7.jar"/>
+-    <property name="antcontrib.jar" value="lib/ant-contrib-1.0b3.jar"/>
++    <property name="gettexttasks.jar" value="/usr/share/java/gettext-ant-tasks.jar"/>
++    <property name="antcontrib.jar" value="/usr/share/java/ant-contrib.jar"/>
+     <target name="init" description="Loads the Ant gettext and contrib tasks">
+         <taskdef name="gettext-extract" classname="org.xnap.commons.ant.gettext.GettextExtractKeysTask" classpath="${gettexttasks.jar}"/>
+         <taskdef name="gettext-merge" classname="org.xnap.commons.ant.gettext.GettextMergeKeysTask" classpath="${gettexttasks.jar}"/>
+@@ -74,7 +74,7 @@
+             <arg line="i18n.pl ${i18n.install.dir}/ ${po.build.dir}/core/*.po"/>
+         </exec>
+     </target>
+-    <target name="plugintrans">
++    <target name="plugintrans" depends="init">
+         <basename file="${path}" property="dir"/>
+         <mkdir dir="${po.build.dir}/plugin_${dir}"/>
+         <gettext-extract keysFile="josm.pot" poDirectory="${po.build.dir}/plugin_${dir}" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
diff --git a/debian/patches/series b/debian/patches/series
index fbb989b..ea565b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 150_routing.diff
+10-i18n-build.xml

-- 
Plugins for JOSM