[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn2561-2-10-gc591763

[David Paleino]

The following commit has been merged in the master branch:
commit c591763b0f3af218c24431de15089562a8119134
Author: David Paleino <dapal at debian.org>
Date:   Fri Mar 12 23:31:49 2010 +0100

    10-build.patch: don't build translations for plugins and fix references to gettext-ant-tasks

diff --git a/debian/changelog b/debian/changelog
index eab9da8..3596220 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,11 @@ josm (0.0.svn3094-1) UNRELEASED; urgency=low
   * debian/patches/*:
     - converted from dpatch to quilt
     - updated to apply to the new code
+    - 10-build.patch: don't build translations for plugins
+      and fix references to gettext-ant-tasks
   * debian/rules, debian/control: use quilt for patch management.
 
- -- David Paleino <dapal at debian.org>  Fri, 12 Mar 2010 12:24:03 +0100
+ -- David Paleino <dapal at debian.org>  Fri, 12 Mar 2010 23:31:13 +0100
 
 josm (0.0.svn2561-2) unstable; urgency=low
 
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index 07d75cf..991d1d5 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -5,8 +5,8 @@ Forwarded: no
 
 ---
  build.xml      |   36 +++++++++++++-----------------------
- i18n/build.xml |   21 +++++++++++++++++++--
- 2 files changed, 32 insertions(+), 25 deletions(-)
+ i18n/build.xml |   26 +++++++++++++++++++++-----
+ 2 files changed, 34 insertions(+), 28 deletions(-)
 
 --- josm.orig/build.xml
 +++ josm/build.xml
@@ -109,7 +109,33 @@ Forwarded: no
  	<path id="test.classpath">
 --- josm.orig/i18n/build.xml
 +++ josm/i18n/build.xml
-@@ -63,7 +63,13 @@
+@@ -1,7 +1,7 @@
+ <project name="JOSM i18n" default="build" basedir=".">
+ 
+   <!-- compilation properties -->
+-  <property name="josm.build.dir"    value="../core"/>
++  <property name="josm.build.dir"    value=".."/>
+   <property name="josm.presets"      value="${josm.build.dir}/data/defaultpresets.xml"/>
+   <property name="josm.style"        value="${josm.build.dir}/styles/standard/elemstyles.xml"/>
+   <property name="plugin.dir"        value="../plugins"/>
+@@ -16,7 +16,7 @@
+ 
+   <property name="ant.build.javac.target" value="1.5"/>
+ 
+-  <property name="gettexttasks.jar" value="lib/gettext-ant-tasks-0.9.7.jar"/>
++  <property name="gettexttasks.jar" value="/usr/share/java/gettext-ant-tasks.jar"/>
+ 
+   <target name="init.gettext" description="Loads the Ant gettext tasks">
+     <taskdef name="gettext-extract" classname="org.xnap.commons.ant.gettext.GettextExtractKeysTask" classpath="${gettexttasks.jar}"/>
+@@ -53,7 +53,6 @@
+     <gettext-extract keysFile="josm.pot" poDirectory="po"
+                      keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
+       <fileset dir="${josm.build.dir}/src" includes="**/*.java"/>
+-      <fileset dir="${plugin.dir}" includes="**/*.java"/>
+       <fileset dir="${i18n.build.dir}" includes="specialmessages.java"/>
+       <fileset dir="${i18n.build.dir}" includes="trans_*.java"/>
+     </gettext-extract>
+@@ -63,7 +62,13 @@
      <gettext-merge keysFile="josm.pot" poDirectory="po"/>
    </target>
  
@@ -124,7 +150,7 @@ Forwarded: no
      <exec executable="perl">
        <arg line="i18n.pl ${i18n.install.dir}/ po/*.po"/>
      </exec>
-@@ -102,10 +108,13 @@
+@@ -102,10 +107,13 @@
      <ant target="build-lang"><property name="language" value="tr"/></ant>
      <ant target="build-lang"><property name="language" value="zh_TW"/></ant>
  
@@ -139,7 +165,7 @@ Forwarded: no
        <arg value="po"/>
      </exec>
      <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-@@ -118,6 +127,13 @@
+@@ -118,6 +126,13 @@
          <attribute name="Translation-Date" value="${version.entry.commit.date}"/>
        </manifest>
      </jar>
@@ -153,7 +179,7 @@ Forwarded: no
    </target>
  
    <target name="build-lang">
-@@ -133,6 +149,7 @@
+@@ -133,6 +148,7 @@
      <delete>
        <fileset dir="po" includes="*.*~" defaultexcludes="false"/>
      </delete>

-- 
Java OpenStreetMap editor