Author: gmascellani-guest Date: 2009-02-15 17:34:34 +0000 (Sun, 15 Feb 2009) New Revision: 1884
Modified: packages/josm/trunk/debian/patches/10_build.dpatch Log: Patch fixing should be over! :-) Modified: packages/josm/trunk/debian/patches/10_build.dpatch =================================================================== --- packages/josm/trunk/debian/patches/10_build.dpatch 2009-02-15 17:27:02 UTC (rev 1883) +++ packages/josm/trunk/debian/patches/10_build.dpatch 2009-02-15 17:34:34 UTC (rev 1884) @@ -5,10 +5,10 @@ ## DP: the dependencies into the target jar file. @DPATCH@ -diff -urNad josm-0.0.svn1137~/build.xml josm-0.0.svn1137/build.xml ---- josm-0.0.svn1137~/build.xml 2008-12-23 21:20:01.000000000 +0100 -+++ josm-0.0.svn1137/build.xml 2008-12-23 21:20:09.000000000 +0100 -@@ -1,41 +1,24 @@ +diff -urNad trunk~/build.xml trunk/build.xml +--- trunk~/build.xml 2008-12-16 09:38:35.000000000 +0100 ++++ trunk/build.xml 2009-02-15 18:28:50.000000000 +0100 +@@ -1,39 +1,22 @@ <project name="josm" default="dist" basedir="."> - <!-- All jar files necessary to run only JOSM (no tests) --> @@ -54,9 +54,7 @@ <property name="version.entry.commit.revision" value="UNKNOWN"/> <property name="version.entry.commit.date" value="UNKNOWN"/> - <!-- images --> - <copy todir="build/images"> -@@ -49,16 +34,21 @@ +@@ -51,16 +34,21 @@ <copy file="README" todir="build"/> <copy file="LICENSE" todir="build"/> @@ -79,7 +77,7 @@ </manifest> </jar> </target> -@@ -68,6 +58,7 @@ +@@ -70,6 +58,7 @@ target="1.5" source="1.5" debug="on" encoding="UTF-8"> <compilerarg value="-Xlint:deprecation"/> </javac> @@ -87,7 +85,7 @@ </target> <target name="init"> -@@ -78,6 +69,7 @@ +@@ -80,6 +69,7 @@ <target name="clean"> <delete dir="build" /> <delete dir="dist" /> @@ -95,10 +93,10 @@ </target> </project> -diff -urNad josm-0.0.svn1137~/i18n/build.xml josm-0.0.svn1137/i18n/build.xml ---- josm-0.0.svn1137~/i18n/build.xml 2008-12-23 21:20:01.000000000 +0100 -+++ josm-0.0.svn1137/i18n/build.xml 2008-12-23 21:20:27.000000000 +0100 -@@ -41,7 +41,13 @@ +diff -urNad trunk~/i18n/build.xml trunk/i18n/build.xml +--- trunk~/i18n/build.xml 2009-02-08 22:44:59.000000000 +0100 ++++ trunk/i18n/build.xml 2009-02-15 18:33:34.000000000 +0100 +@@ -45,7 +45,13 @@ </exec> </target> @@ -112,15 +110,15 @@ + <target name="build" depends="build.check" if="build.run"> <copy file="i18n.properties" todir="build/org/openstreetmap/josm" /> - <ant target="build-lang"><property name="language" value="cs"/></ant> -@@ -55,29 +61,37 @@ - <ant target="build-lang"><property name="language" value="sl"/></ant> + <ant target="build-lang"><property name="language" value="bg"/></ant> +@@ -69,10 +75,13 @@ <ant target="build-lang"><property name="language" value="sv"/></ant> + <ant target="build-lang"><property name="language" value="tr"/></ant> -- <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false"> -+ <touch file="build-timestamp"/> ++ <touch file="build-timestamp"/> + -+ <!--<exec append="false" output="REVISION" executable="svn" failifexecutionfails="false"> ++ <!-- + <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false"> <env key="LANG" value="C"/> <arg value="info"/> - <arg value="--xml"/> @@ -128,18 +126,11 @@ <arg value="po"/> </exec> <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/> -- <delete file="REVISION"/> -+ <delete file="REVISION"/>--> - -- <jar destfile="${i18n.jar}" basedir="build"> -+ <!--<jar destfile="${i18n.jar}" basedir="build"> - <manifest> - <attribute name="Extension-Name" value="JOSM Translation into various languages" /> - <attribute name="Translation-Version" value="${version.entry.commit.revision}"/> +@@ -85,14 +94,23 @@ <attribute name="Translation-Date" value="${version.entry.commit.date}"/> </manifest> -- </jar> -+ </jar>--> + </jar> ++ --> </target> @@ -150,17 +141,18 @@ + </target> + <target name="build-lang"> -- <exec executable="msgmerge"> -+ <!--<exec executable="msgmerge"> + <property name="jlanguage" value="${language}"/> ++ <!-- + <exec executable="msgmerge"> <arg line="-U po/${language}.po po/josm.pot"/> -- </exec> -+ </exec>--> + </exec> ++ --> <exec executable="msgfmt"> - <arg line="--verbose --java2 -dbuild -rorg.openstreetmap.josm.i18n.Translation -l${language} po/${language}.po"/> -@@ -92,6 +106,7 @@ - <delete file="wms.java"/> - <delete file="surveyor.java"/> + <arg line="--verbose --java2 -dbuild -rorg.openstreetmap.josm.i18n.Translation -l${jlanguage} po/${language}.po"/> +@@ -107,6 +125,7 @@ + <fileset dir="." includes="trans_*.java"/> + </delete> <delete file="java_sourcefiles.txt"/> + <delete file="build-timestamp"/> </target> _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel