The following commit has been merged in the master branch: commit 4b2e933d75d4db97c3f0f7f4184e440d3a02aa8d Author: David Paleino <da...@debian.org> Date: Wed Sep 28 11:32:47 2011 +0200
Add missing dependency on commons-codec, fixing exceptions during upload. diff --git a/debian/changelog b/debian/changelog index deb5e1a..a2bc17d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +josm (0.0.svn4399+dfsg2-2) UNRELEASED; urgency=low + + [ Damien Raude-Morvan ] + * Add missing dependency on commons-codec, fixing exceptions during + upload. + + -- David Paleino <da...@debian.org> Wed, 28 Sep 2011 11:31:57 +0200 + josm (0.0.svn4399+dfsg2-1) unstable; urgency=low * Reintroduce ntf_r93_b.gsb in the package: its removal should be diff --git a/debian/control b/debian/control index 6ba2e55..35eaa69 100644 --- a/debian/control +++ b/debian/control @@ -16,6 +16,7 @@ Build-Depends: , debhelper (>= 8~) , gettext , default-jdk + , libcommons-codec-java , libgettext-commons-java (>= 0.9.6) , libmetadata-extractor-java , libgettext-ant-tasks-java @@ -32,6 +33,7 @@ Package: josm Architecture: all Depends: openjdk-6-jre | sun-java6-jre + , libcommons-codec-java , libgettext-commons-java (>= 0.9.6) , libmetadata-extractor-java , liboauth-signpost-java (>= 1.2) diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch index 8a4cbdb..9e7f288 100644 --- a/debian/patches/10-build.patch +++ b/debian/patches/10-build.patch @@ -7,14 +7,12 @@ Adjustements to the ant build.xml files, mainly to use system-provided JARs and not depend on Internet connection. --- - build.xml | 34 +++++++++++----------------------- - i18n/build.xml | 26 +++++++++++++++++++++----- - 2 files changed, 32 insertions(+), 28 deletions(-) + build.xml | 48 ++++++++++++++++++++++++------------------------ + i18n/build.xml | 26 ++++++++++++++++---------- + 2 files changed, 40 insertions(+), 34 deletions(-) -Index: josm/build.xml -=================================================================== ---- josm.orig/build.xml 2011-08-08 12:50:14.000000000 +0200 -+++ josm/build.xml 2011-08-08 12:52:01.000000000 +0200 +--- josm.orig/build.xml ++++ josm/build.xml @@ -15,6 +15,7 @@ <property name="build.dir" location="build"/> <property name="javacc.home" location="tools"/> @@ -23,7 +21,7 @@ Index: josm/build.xml <!-- build parameter: compression level (ant -Dclevel=N) N ranges from 0 (no compression) to 9 (maximum compression) default: 9 --> -@@ -23,10 +24,16 @@ +@@ -23,10 +24,17 @@ </condition> <!-- Java classpath addition (all jar files to compile tests with this) --> <path id="classpath"> @@ -36,13 +34,14 @@ Index: josm/build.xml + <include name="gdata-core.jar"/> + <include name="signpost-core.jar"/> + <include name="ant.jar"/> ++ <include name="commons-codec.jar"/> </fileset> </path> + <property name="classpathprop-colon" refid="classpath"/> <!-- ** Used by Eclipse ant builder for updating -@@ -41,14 +48,7 @@ +@@ -41,14 +49,7 @@ --> <target name="create-revision"> <property name="revision.dir" value="${build.dir}"/> @@ -58,7 +57,7 @@ Index: josm/build.xml <tstamp> <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/> </tstamp> -@@ -59,31 +59,31 @@ +@@ -59,31 +60,31 @@ Revision: ${version.entry.commit.revision} Is-Local-Build: true Build-Date: ${build.tstamp} @@ -98,7 +97,7 @@ Index: josm/build.xml </manifest> <zipfileset dir="images" prefix="images"/> <zipfileset dir="data" prefix="data"/> -@@ -109,30 +109,29 @@ +@@ -109,30 +110,29 @@ Build-Date: ${build.tstamp} </target> <target name="javacc"> <mkdir dir="${mapcss.dir}/parsergen"/> @@ -134,10 +133,8 @@ Index: josm/build.xml </target> <path id="test.classpath"> <fileset dir="${test.dir}/lib"> -Index: josm/i18n/build.xml -=================================================================== ---- josm.orig/i18n/build.xml 2011-08-08 12:50:14.000000000 +0200 -+++ josm/i18n/build.xml 2011-08-08 12:51:03.000000000 +0200 +--- josm.orig/i18n/build.xml ++++ josm/i18n/build.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <project name="JOSM i18n" default="build" basedir="."> diff --git a/debian/patches/90-fix_version.patch b/debian/patches/90-fix_version.patch index d4b5de0..91b5ad9 100644 --- a/debian/patches/90-fix_version.patch +++ b/debian/patches/90-fix_version.patch @@ -8,11 +8,9 @@ Forwarded: not-needed src/org/openstreetmap/josm/data/Version.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) -Index: josm/build.xml -=================================================================== ---- josm.orig/build.xml 2011-08-08 12:50:06.000000000 +0200 -+++ josm/build.xml 2011-08-08 12:50:06.000000000 +0200 -@@ -80,7 +80,7 @@ +--- josm.orig/build.xml ++++ josm/build.xml +@@ -81,7 +81,7 @@ Debian-Release: ${debian.version} <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar --> <manifest> <attribute name="Main-class" value="JOSM"/> @@ -21,11 +19,9 @@ Index: josm/build.xml <attribute name="Main-Date" value="${version.entry.commit.date}"/> <attribute name="Debian-Release" value="${debian.version}"/> <attribute name="Class-Path" value="${classpathprop}"/> -Index: josm/src/org/openstreetmap/josm/data/Version.java -=================================================================== ---- josm.orig/src/org/openstreetmap/josm/data/Version.java 2011-08-08 12:50:06.000000000 +0200 -+++ josm/src/org/openstreetmap/josm/data/Version.java 2011-08-08 12:50:06.000000000 +0200 -@@ -205,9 +205,6 @@ +--- josm.orig/src/org/openstreetmap/josm/data/Version.java ++++ josm/src/org/openstreetmap/josm/data/Version.java +@@ -205,9 +205,6 @@ public class Version { public String getAgentString() { int v = getVersion(); String s = (v == JOSM_UNKNOWN_VERSION) ? "UNKNOWN" : Integer.toString(v); -- 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