[josm] 06/07: Re-enable i18n build for core translations.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository josm.

commit be3d282018445c6317dd66e52a00ac31ceeb84bd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Oct 10 20:27:57 2015 +0200

    Re-enable i18n build for core translations.
---
 debian/changelog              |  1 +
 debian/josm-l10n.install      |  2 +-
 debian/patches/00-build.patch | 27 ++++++++++++++++++---------
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 89d8ae8..06bbc81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ josm (0.0.svn8800+dfsg3-1~exp1) UNRELEASED; urgency=medium
 
   * Also remove OSX support from upstream source.
   * Improve DEP3 patch headers, use HTTPS URLS in BTS patch.
+  * Re-enable i18n build for core translations.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 10 Oct 2015 18:37:25 +0200
 
diff --git a/debian/josm-l10n.install b/debian/josm-l10n.install
index 6a1cc4d..7661663 100644
--- a/debian/josm-l10n.install
+++ b/debian/josm-l10n.install
@@ -1 +1 @@
-data_nodist/trans/*.lang    /usr/share/josm/data/
+data/*.lang    /usr/share/josm/data/
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 9f7d21e..3e4783f 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -172,29 +172,38 @@ Forwarded: not-needed
      <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}"/>
          <!-- for the <foreach> possibility -->
-@@ -92,14 +92,13 @@
+@@ -51,7 +51,7 @@
+             <fileset dir="${plugin.dir}" includes="**/*.java"/>
+         </gettext-extract>
+     </target>
+-    <target name="po/core.pot" description="Extracts message keys from the JOSM core source code" depends="trans_.java,init">
++    <target name="po/core.pot" description="Extracts message keys from the JOSM core source code" depends="builddir,init">
+         <gettext-extract keysFile="core.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="${i18n.build.dir}" includes="specialmessages.java"/>
+@@ -92,14 +92,14 @@
          <delete file="${po.build.dir}/data.pot"/>
          <delete file="${po.build.dir}/plugins.raw.pot"/>
      </target>
 -    <target name="build" depends="pot,allpot">
--        <antcall target="coretrans"/>
++    <target name="build.check">
++        <condition property="build.run">
++            <not><available file="build-timestamp"/></not>
++        </condition>
++    </target>
++    <target name="build" depends="build.check,po/core.pot" if="build.run">
+         <antcall target="coretrans"/>
 -        <antcall target="datatrans"/>
 -        <foreach param="path" target="plugintrans">
 -            <path>
 -                <dirset dir="${plugin.dir}" includes="*" excludes="00_*" />
 -            </path>
 -        </foreach>
-+    <target name="build.check">
-+        <condition property="build.run">
-+            <not><available file="build-timestamp"/></not>
-+        </condition>
-+    </target>
-+    <target name="build" depends="build.check">
 +        <touch file="build-timestamp"/>
      </target>
      <target name="singleplugintrans" depends="init">
          <antcall target="plugintrans">
-@@ -141,15 +140,14 @@
+@@ -141,15 +141,14 @@
          </if>
          <delete dir="${po.build.dir}/plugin_${dir}"/>
      </target>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git