Hi pkg-osm team,

When trying to build current josm (from pkg-osm git master branch), I've 
noticed that upload is broken because of ClassNotFound exception on commons-
codec item.

Here is (attached) a patch to fix this.

Cheers,
-- 
Damien - Debian Developper
http://wiki.debian.org/DamienRaudeMorvan
From 010271d7214742b1d8b478b2d6e5fb82024b174a Mon Sep 17 00:00:00 2001
From: Damien Raude-Morvan <draz...@debian.org>
Date: Tue, 6 Sep 2011 22:31:19 +0200
Subject: [PATCH] Add commons-codec to MANIFEST

---
 debian/control                |    2 ++
 debian/patches/10-build.patch |   21 +++++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

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..222ca30 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -11,10 +11,10 @@ JARs and not depend on Internet connection.
  i18n/build.xml |   26 +++++++++++++++++++++-----
  2 files changed, 32 insertions(+), 28 deletions(-)
 
-Index: josm/build.xml
+Index: b/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
+--- a/build.xml
++++ b/build.xml
 @@ -15,6 +15,7 @@
      <property name="build.dir" location="build"/>
      <property name="javacc.home" location="tools"/>
@@ -23,7 +23,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 +36,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 +59,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 +99,7 @@ Index: josm/build.xml
              </manifest>
              <zipfileset dir="images" prefix="images"/>
              <zipfileset dir="data" prefix="data"/>
-@@ -109,30 +109,29 @@
+@@ -109,30 +110,29 @@
      </target>
      <target name="javacc">
          <mkdir dir="${mapcss.dir}/parsergen"/>
@@ -134,10 +135,10 @@ Index: josm/build.xml
      </target>
      <path id="test.classpath">
          <fileset dir="${test.dir}/lib">
-Index: josm/i18n/build.xml
+Index: b/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
+--- a/i18n/build.xml
++++ b/i18n/build.xml
 @@ -1,7 +1,7 @@
  <?xml version="1.0" encoding="utf-8"?>
  <project name="JOSM i18n" default="build" basedir=".">
-- 
1.7.5.4

Attachment: signature.asc
Description: This is a digitally signed message part.

_______________________________________________
Pkg-osm-maint mailing list
Pkg-osm-maint@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-maint

Reply via email to