The following commit has been merged in the master branch: commit a98da01b0913e78f662a23e96bff6d67fbd1a551 Author: David Paleino <da...@debian.org> Date: Thu Mar 6 00:06:36 2014 +0100
Move bits of patches around to correct places diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch index b497089..57d1bb4 100644 --- a/debian/patches/00-build.patch +++ b/debian/patches/00-build.patch @@ -7,9 +7,9 @@ Adjustements to the ant build.xml files, mainly to use system-provided JARs and not depend on Internet connection. --- - build.xml | 45 +++++++++++++++++++++------------------------ + build.xml | 44 ++++++++++++++++++++------------------------ i18n/build.xml | 33 ++++++++++++++++----------------- - 2 files changed, 37 insertions(+), 41 deletions(-) + 2 files changed, 36 insertions(+), 41 deletions(-) --- josm.orig/build.xml +++ josm/build.xml @@ -21,7 +21,7 @@ JARs and not depend on Internet connection. <!-- build parameter: compression level (ant -Dclevel=N) N ranges from 0 (no compression) to 9 (maximum compression) default: 9 --> -@@ -22,10 +23,17 @@ +@@ -22,10 +23,16 @@ </condition> <!-- Java classpath addition (all jar files to compile tests with this) --> <path id="classpath"> @@ -34,14 +34,13 @@ JARs and not depend on Internet connection. + <include name="signpost-core.jar"/> + <include name="ant.jar"/> + <include name="commons-codec.jar"/> -+ <include name="jmapviewer.jar"/> </fileset> </path> + <property name="classpathprop-colon" refid="classpath"/> <!-- ** Used by Eclipse ant builder for updating -@@ -40,14 +48,7 @@ +@@ -40,14 +47,7 @@ --> <target name="create-revision"> <property name="revision.dir" value="${build.dir}"/> @@ -57,7 +56,7 @@ JARs and not depend on Internet connection. <tstamp> <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/> </tstamp> -@@ -59,6 +60,7 @@ +@@ -59,6 +59,7 @@ Revision: ${version.entry.commit.revision} Is-Local-Build: true Build-Date: ${build.tstamp} @@ -65,7 +64,7 @@ JARs and not depend on Internet connection. </echo> </target> <target name="check-schemas"> -@@ -70,14 +72,7 @@ Build-Date: ${build.tstamp} +@@ -70,14 +71,7 @@ Build-Date: ${build.tstamp} </schemavalidate> </target> <target name="dist" depends="compile,create-revision,check-schemas"> @@ -80,7 +79,7 @@ JARs and not depend on Internet connection. <property name="version.entry.commit.revision" value="UNKNOWN"/> <property name="version.entry.commit.date" value="UNKNOWN"/> <echo>Revision ${version.entry.commit.revision}</echo> -@@ -85,7 +80,8 @@ Build-Date: ${build.tstamp} +@@ -85,7 +79,8 @@ Build-Date: ${build.tstamp} <copy file="README" todir="build"/> <copy file="LICENSE" todir="build"/> <!-- create josm-custom.jar --> @@ -90,7 +89,7 @@ JARs and not depend on Internet connection. <jar destfile="dist/josm-custom.jar" basedir="build" level="${clevel}"> <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar --> <manifest> -@@ -95,6 +91,8 @@ Build-Date: ${build.tstamp} +@@ -95,6 +90,8 @@ Build-Date: ${build.tstamp} <attribute name="Permissions" value="all-permissions"/> <attribute name="Codebase" value="josm.openstreetmap.de"/> <attribute name="Application-Name" value="JOSM - Java OpenStreetMap Editor"/> @@ -99,7 +98,7 @@ JARs and not depend on Internet connection. </manifest> <zipfileset dir="images" prefix="images"/> <zipfileset dir="data" prefix="data"/> -@@ -168,10 +166,7 @@ Build-Date: ${build.tstamp} +@@ -168,10 +165,7 @@ Build-Date: ${build.tstamp} </target> <target name="javacc" depends="init" unless="javacc.notRequired"> <mkdir dir="${mapcss.dir}/parsergen"/> @@ -111,7 +110,7 @@ JARs and not depend on Internet connection. <arg value="-JDK_VERSION=1.6"/> <arg value="-GRAMMAR_ENCODING=UTF-8"/> <arg value="-UNICODE_INPUT"/> -@@ -180,11 +175,11 @@ Build-Date: ${build.tstamp} +@@ -180,11 +174,11 @@ Build-Date: ${build.tstamp} </exec> </target> <target name="compile" depends="init,javacc"> @@ -125,7 +124,7 @@ JARs and not depend on Internet connection. </target> <target name="init"> <uptodate property="javacc.notRequired" targetfile="${mapcss.dir}/parsergen/MapCSSParser.java" > -@@ -192,6 +187,7 @@ Build-Date: ${build.tstamp} +@@ -192,6 +186,7 @@ Build-Date: ${build.tstamp} </uptodate> <mkdir dir="build"/> <mkdir dir="dist"/> @@ -133,7 +132,7 @@ JARs and not depend on Internet connection. </target> <target name="javadoc"> <javadoc destdir="javadoc" -@@ -211,6 +207,7 @@ Build-Date: ${build.tstamp} +@@ -211,6 +206,7 @@ Build-Date: ${build.tstamp} <delete dir="build"/> <delete dir="dist"/> <delete dir="${mapcss.dir}/parsergen"/> diff --git a/debian/patches/04-use_system_jmapviewer.patch b/debian/patches/04-use_system_jmapviewer.patch index bfa0935..c98f3b0 100644 --- a/debian/patches/04-use_system_jmapviewer.patch +++ b/debian/patches/04-use_system_jmapviewer.patch @@ -5,12 +5,20 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=731029 Forwarded: no --- - build.xml | 1 - - 1 file changed, 1 deletion(-) + build.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) --- josm.orig/build.xml +++ josm/build.xml -@@ -97,7 +97,6 @@ Debian-Release: ${debian.version} +@@ -30,6 +30,7 @@ + <include name="signpost-core.jar"/> + <include name="ant.jar"/> + <include name="commons-codec.jar"/> ++ <include name="jmapviewer.jar"/> + </fileset> + </path> + <property name="classpathprop-colon" refid="classpath"/> +@@ -96,7 +97,6 @@ Debian-Release: ${debian.version} <zipfileset dir="images" prefix="images"/> <zipfileset dir="data" prefix="data"/> <zipfileset dir="styles" prefix="styles"/> -- 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