[Pkg-osm-commits] [SCM] josm-plugins branch, master, updated. debian/0.0.svn26626+ds1-2-9-g198feba

[David Paleino]

The following commit has been merged in the master branch:
commit e35ccd0e99c59405458a8b1ef9cee0485fafb5f2
Author: David Paleino <dapal at debian.org>
Date:   Mon Dec 26 18:48:02 2011 +0100

    debian/patches/10-i18n-build.xml removed -- i18n directory isn't being packaged anymore

diff --git a/debian/changelog b/debian/changelog
index a142e0c..ad46bff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ josm-plugins (0.0.svn27285+ds1-1) UNRELEASED; urgency=low
 
   * New upstream snapshot
   * Don't download i18n data anymore when creating new orig.tar.gz
+  * debian/patches/10-i18n-build.xml removed -- i18n directory isn't
+    being packaged anymore
 
- -- David Paleino <dapal at debian.org>  Mon, 26 Dec 2011 18:47:05 +0100
+ -- David Paleino <dapal at debian.org>  Mon, 26 Dec 2011 18:47:40 +0100
 
 josm-plugins (0.0.svn26626+ds1-2) unstable; urgency=low
 
diff --git a/debian/master.xml b/debian/master.xml
index 579a2d4..2ada87c 100644
--- a/debian/master.xml
+++ b/debian/master.xml
@@ -5,7 +5,6 @@
     <property name="josm"               location="/usr/share/josm/josm.jar"/>
     <property name="plugin.dist.dir"    location="../dist"/>
     <property name="plugin.dir"         location=".."/>
-    <property name="po.build.dir"       value="../build"/>
 
     <xmlproperty file="../svn-info.xml" prefix="version" keepRoot="false" collapseAttributes="true"/>
 
@@ -13,18 +12,12 @@
     <target name="init">
         <mkdir dir="${josm.build.dir}"/> 
         <mkdir dir="${plugin.dist.dir}"/>
-        <mkdir dir="${po.build.dir}"/>
     </target>
 
     <target name="do_plugin">
       <!-- The data dir could have been deleted from GIT repository when empty -->
       <mkdir dir="../${plugin.name}/data"/>
 
-      <!-- Build the translation files -->
-      <ant dir="../i18n" antfile="build.xml" target="plugintrans">
-	<property name="path" value="${plugin.name}"/>
-      </ant>
-
       <!-- Build the plugin -->
       <ant dir="../${plugin.name}" antfile="build.xml" target="dist">
 	<property name="plugin.jar" value="${plugin.dist.dir}/${plugin.name}.jar"/>
@@ -89,6 +82,5 @@
         <ant dir="../surveyor"           antfile="build.xml" target="clean"/>
         <delete dir="../tmp"/>
         <delete dir="${plugin.dist.dir}"/>
-	<delete dir="${po.build.dir}"/>
     </target>
 </project>
diff --git a/debian/patches/10-i18n-build.xml b/debian/patches/10-i18n-build.xml
deleted file mode 100644
index a1607b6..0000000
--- a/debian/patches/10-i18n-build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-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 ea565b8..fbb989b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 150_routing.diff
-10-i18n-build.xml

-- 
Plugins for JOSM