The following commit has been merged in the master branch: commit 424e8982b27cdaeb641157138f4dc2457bc74d9b Author: David Paleino <da...@debian.org> Date: Wed Mar 5 20:43:01 2014 +0100
De-fuzzed 00-build.patch diff --git a/debian/changelog b/debian/changelog index 8d6a415..87ba4c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ josm (0.0.svn6502+dfsg2-1) UNRELEASED; urgency=medium * New DFSG tarball - removed embedded code copy of jmapviewer (Closes: #731029) + * De-fuzzed 00-build.patch - -- David Paleino <da...@debian.org> Wed, 05 Mar 2014 20:41:34 +0100 + -- David Paleino <da...@debian.org> Wed, 05 Mar 2014 20:42:35 +0100 josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch index 7011065..57d1bb4 100644 --- a/debian/patches/00-build.patch +++ b/debian/patches/00-build.patch @@ -162,9 +162,9 @@ JARs and not depend on Internet connection. <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}"/> -@@ -50,14 +50,14 @@ - <fileset dir="${plugin.dir}" includes="**/*.java"/> - </gettext-extract> +@@ -79,14 +79,14 @@ + <arg line="--unique po/core.pot ${i18n.build.dir}/core.2.pot ${i18n.build.dir}/plugins.raw.pot"/> + </exec> </target> - <target name="build" depends="po/josm.pot,init"> - <gettext-merge keysFile="josm.pot" poDirectory="po"/> @@ -184,7 +184,7 @@ JARs and not depend on Internet connection. </target> <target name="singleplugintrans" depends="po/josm.pot,init"> <antcall target="plugintrans"> -@@ -103,15 +103,14 @@ +@@ -137,15 +137,14 @@ </if> <delete dir="${po.build.dir}/plugin_${dir}"/> </target> -- Editor for OpenStreetMap _______________________________________________ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits