Author: hanska-guest Date: 2009-09-11 22:03:14 +0000 (Fri, 11 Sep 2009) New Revision: 2429
Modified: packages/josm/trunk/debian/changelog packages/josm/trunk/debian/patches/10_build.dpatch Log: debian/patches/10_build.dpatch updated, mostly integrated upstream Modified: packages/josm/trunk/debian/changelog =================================================================== --- packages/josm/trunk/debian/changelog 2009-09-11 21:30:56 UTC (rev 2428) +++ packages/josm/trunk/debian/changelog 2009-09-11 22:03:14 UTC (rev 2429) @@ -2,6 +2,8 @@ [ David Paleino ] * New upstream release (closes: #542653, #541326) + * debian/patches/: + - 10_build.dpatch updated, mostly integrated upstream [ Giovanni Mascellani ] * debian/josm.sh: wrong java executable path for java 1.5.0 (closes: #525020). @@ -10,7 +12,7 @@ * Plugin list update fixed (closes: #532742) * Policy version bumbed to 3.8.3 (no changes required) - -- David Paleino <d.pale...@gmail.com> Fri, 11 Sep 2009 23:28:28 +0200 + -- David Paleino <d.pale...@gmail.com> Sat, 12 Sep 2009 00:01:57 +0200 josm (0.0.svn1529-1) unstable; urgency=low Modified: packages/josm/trunk/debian/patches/10_build.dpatch =================================================================== --- packages/josm/trunk/debian/patches/10_build.dpatch 2009-09-11 21:30:56 UTC (rev 2428) +++ packages/josm/trunk/debian/patches/10_build.dpatch 2009-09-11 22:03:14 UTC (rev 2429) @@ -1,149 +1,18 @@ #! /bin/sh /usr/share/dpatch/dpatch-run ## 10_build.dpatch by Andreas Putzo <andr...@putzo.net> ## -## DP: Adjustments to the ant build file, mainly to not include +## DP: Adjustments to the ant build file, mainly to not include ## DP: the dependencies into the target jar file. @DPATCH@ -diff -urNad trunk~/build.xml trunk/build.xml ---- trunk~/build.xml 2009-07-08 22:06:58.000000000 +0200 -+++ trunk/build.xml 2009-07-17 14:22:54.000000000 +0200 -@@ -4,47 +4,40 @@ - <property name="build.dir" value="build"/> - - <!-- Java classpath addition (all jar files to compile tests with this) --> -- <path id="classpath"> -- <fileset dir="lib"> -- <include name="**/*.jar"/> -+ <path id="classpath"> -+ <fileset dir="/usr/share/java"> -+ <include name="gettext-commons.jar"/> -+ <include name="metadata-extractor.jar"/> - </fileset> - </path> - - <target name="dist" depends="compile"> -- -- <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false"> -- <env key="LANG" value="C"/> -- <arg value="info"/> -- <arg value="--xml"/> -- <arg value="."/> -- </exec> - <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/> -- <delete file="REVISION"/> - <property name="version.entry.commit.revision" value="UNKNOWN"/> - <property name="version.entry.commit.date" value="UNKNOWN"/> - - <copy file="CONTRIBUTION" todir="build"/> - <copy file="README" todir="build"/> -- <copy file="LICENSE" todir="build"/> -+ <copy file="LICENSE" todir="build"/> -+ -+ <ant target="dist" dir="i18n"/> - - <!-- styles --> -- <copy file="styles/standard/elemstyles.xml" todir="build/styles/standard"/> -+ <copy file="styles/standard/elemstyles.xml" todir="build/styles/standard"/> -+ -+ <property environment="env"/> - - <!-- create josm-custom.jar --> -- <delete file="dist/josm-custom.jar"/> - <jar destfile="dist/josm-custom.jar" basedir="build"> - <manifest> - <attribute name="Main-class" value="JOSM" /> - <attribute name="Main-Version" value="${version.entry.commit.revision} SVN"/> -- <attribute name="Main-Date" value="${version.entry.commit.date}"/> -+ <attribute name="Main-Date" value="${version.entry.commit.date}"/> -+ <attribute name="Debian-Release" value="${debian.version}"/> -+ <attribute name="Class-Path" value="/usr/share/java/gettext-commons.jar /usr/share/java/metadata-extractor.jar"/> - </manifest> - <zipfileset dir="presets" prefix="presets" /> - <zipfileset dir="images" prefix="images" /> -- <zipfileset src="lib/josm-translation.jar" /> -- -- <!-- All jar files necessary to run only JOSM (no tests) --> -- <zipfileset src="lib/gettext-commons-0.9.6.jar" /> -- <zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" /> - </jar> - </target> - -@@ -66,7 +59,8 @@ - <javac srcdir="src" classpathref="classpath" destdir="build" - target="1.5" source="1.5" debug="on" encoding="UTF-8"> - <compilerarg value="-Xlint:deprecation"/> -- </javac> -+ </javac> -+ <ant target="build" dir="i18n"/> - </target> - - <target name="init"> -@@ -76,7 +70,8 @@ - - <target name="clean"> - <delete dir="build" /> -- <delete dir="dist" /> -+ <delete dir="dist" /> -+ <ant target="clean" dir="i18n"/> - </target> - - <path id="test.classpath"> -diff -urNad trunk~/i18n/build.xml trunk/i18n/build.xml ---- trunk~/i18n/build.xml 2009-07-09 10:54:34.000000000 +0200 -+++ trunk/i18n/build.xml 2009-07-17 14:22:41.000000000 +0200 -@@ -58,10 +58,14 @@ - </gettext-extract> - </target> +diff -urNad josm-0.0.svn1981~/build.xml josm-0.0.svn1981/build.xml +--- josm-0.0.svn1981~/build.xml 2009-09-11 23:56:17.000000000 +0200 ++++ josm-0.0.svn1981/build.xml 2009-09-11 23:59:21.000000000 +0200 +@@ -68,6 +68,7 @@ + <compilerarg value="-Xlint:deprecation"/> + <compilerarg value="-Xlint:unchecked"/> + </javac> ++ <ant target="build" dir="i18n"/> + </target> -- <target name="build" depends="po/josm.pot,init.gettext"> -- <copy file="i18n.properties" todir="build/org/openstreetmap/josm" /> -+ <target name="build.check"> -+ <condition property="build.run"> -+ <not><available file="build-timestamp"/></not> -+ </condition> -+ </target> - -- <gettext-merge keysFile="josm.pot" poDirectory="po"/> -+ <target name="build" depends="build.check" if="build.run"> -+ <copy file="i18n.properties" todir="build/org/openstreetmap/josm" /> - - <!--<gettext-dist targetBundle="org.openstreetmap.josm.i18n.Translation" - poDirectory="po" outputDirectory="build"/>--> -@@ -93,10 +97,13 @@ - <ant target="build-lang"><property name="language" value="tr"/></ant> - <ant target="build-lang"><property name="language" value="zh_TW"/></ant> - -+ <touch file="build-timestamp"/> -+ -+ <!-- - <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false"> - <env key="LANG" value="C"/> - <arg value="info"/> -- <arg value="--xml"/> -+ <arg value="-xml"/> - <arg value="po"/> - </exec> - <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/> -@@ -109,6 +116,13 @@ - <attribute name="Translation-Date" value="${version.entry.commit.date}"/> - </manifest> - </jar> -+ --> -+ </target> -+ -+ <target name="dist" depends="build"> -+ <copy todir="../build"> -+ <fileset dir="build"/> -+ </copy> - </target> - - <target name="build-lang"> -@@ -124,6 +138,7 @@ - <delete> - <fileset dir="po" includes="*.*~" defaultexcludes="false"/> - </delete> -+ <delete file="build-timestamp"/> - </target> - - </project> + <target name="init"> _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel