The following commit has been merged in the master branch:
commit 5b88ab13c1e1a0ea180d0e887d4b642b1e017390
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date: Mon Aug 8 00:23:55 2011 +0200
Excluding duplicated code from compilation.
diff --git a/debian/control b/debian/control
index 596947b..6ba2e55 100644
--- a/debian/control
+++ b/debian/control
@@ -10,17 +10,19 @@ Uploaders:
, Debian GIS Project <pkg-grass-de...@lists.alioth.debian.org>
DM-Upload-Allowed: yes
Build-Depends:
- ant,
- debhelper (>= 8~),
- gettext,
- default-jdk,
- libgettext-commons-java (>= 0.9.6),
- libmetadata-extractor-java,
- libgettext-ant-tasks-java,
- libterm-readkey-perl
- , liboauth-signpost-java (>= 1.2)
- , javacc
+ ant
, ant-contrib
+ , javacc
+ , debhelper (>= 8~)
+ , gettext
+ , default-jdk
+ , libgettext-commons-java (>= 0.9.6)
+ , libmetadata-extractor-java
+ , libgettext-ant-tasks-java
+ , liboauth-signpost-java (>= 1.2)
+ , libgdata-java
+ , libsvgsalamander-java
+ , libterm-readkey-perl
Standards-Version: 3.9.2
Homepage: http://josm.openstreetmap.de
Vcs-Git: git://git.debian.org/pkg-osm/josm.git
@@ -29,12 +31,14 @@ Vcs-Browser: http://git.debian.org/?p=pkg-osm/josm.git
Package: josm
Architecture: all
Depends:
- openjdk-6-jre | sun-java6-jre,
- libgettext-commons-java (>= 0.9.6),
- libmetadata-extractor-java,
- liboauth-signpost-java (>= 1.2),
- openstreetmap-map-icons-classic,
- ${misc:Depends}
+ openjdk-6-jre | sun-java6-jre
+ , libgettext-commons-java (>= 0.9.6)
+ , libmetadata-extractor-java
+ , liboauth-signpost-java (>= 1.2)
+ , libgdata-java
+ , libsvgsalamander-java
+ , openstreetmap-map-icons-classic
+ , ${misc:Depends}
Recommends: josm-plugins
, webkit-image-gtk | webkit-image-qt
Description: Editor for OpenStreetMap
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index 2521f72..5ee2d68 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -13,9 +13,9 @@ JARs and not depend on Internet connection.
Index: josm/build.xml
===================================================================
---- josm.orig/build.xml 2011-08-07 13:23:59.000000000 +0200
-+++ josm/build.xml 2011-08-07 13:24:09.000000000 +0200
-@@ -23,8 +23,9 @@
+--- josm.orig/build.xml 2011-08-07 13:27:53.000000000 +0200
++++ josm/build.xml 2011-08-08 00:23:16.000000000 +0200
+@@ -23,8 +23,13 @@
</condition>
<!-- Java classpath addition (all jar files to compile tests with this)
-->
<path id="classpath">
@@ -24,10 +24,14 @@ Index: josm/build.xml
+ <fileset dir="/usr/share/java">
+ <include name="gettext-commons.jar"/>
+ <include name="metadata-extractor.jar"/>
++ <include name="svgSalamander.jar"/>
++ <include name="gdata-core.jar"/>
++ <include name="signpost-core.jar"/>
++ <include name="ant.jar"/>
</fileset>
</path>
-@@ -41,14 +42,7 @@
+@@ -41,14 +46,7 @@
-->
<target name="create-revision">
<property name="revision.dir" value="${build.dir}"/>
@@ -43,7 +47,7 @@ Index: josm/build.xml
<tstamp>
<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
-@@ -59,31 +53,29 @@
+@@ -59,31 +57,29 @@
Revision: ${version.entry.commit.revision}
Is-Local-Build: true
Build-Date: ${build.tstamp}
@@ -77,11 +81,11 @@ Index: josm/build.xml
<attribute name="Main-Version"
value="${version.entry.commit.revision} SVN"/>
<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 /usr/share/java/signpost-core.jar"/>
++ <attribute name="Class-Path"
value="${classpath}"/>
</manifest>
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
-@@ -109,10 +101,7 @@
+@@ -109,21 +105,18 @@
</target>
<target name="javacc">
<mkdir dir="${mapcss.dir}/parsergen"/>
@@ -93,7 +97,12 @@ Index: josm/build.xml
<arg value="-OUTPUT_DIRECTORY=${mapcss.dir}/parsergen"/>
<arg value="${mapcss.dir}/MapCSSParser.jj"/>
</exec>
-@@ -124,6 +113,7 @@
+ <!-- <javacc target="${mapcss.dir}/MapCSSParser.jj"
javacchome="${javacc.home}" outputdirectory="${mapcss.dir}/parsergen"/>-->
+ </target>
+ <target name="compile" depends="javacc,init">
+- <javac srcdir="src"
includes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build"
target="1.5" source="1.5" debug="on" encoding="iso-8859-1"/>
+- <javac srcdir="src"
excludes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build"
target="1.5" source="1.5" debug="on" encoding="UTF-8">
++ <javac srcdir="src" excludes="com/**,oauth/**,org/apache/**"
destdir="build" target="1.5" source="1.5" debug="on" encoding="UTF-8">
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:unchecked"/>
</javac>
@@ -101,7 +110,7 @@ Index: josm/build.xml
</target>
<target name="init">
<mkdir dir="build"/>
-@@ -133,6 +123,7 @@
+@@ -133,6 +126,7 @@
<delete dir="build"/>
<delete dir="dist"/>
<delete dir="${mapcss.dir}/parsergen"/>
@@ -111,8 +120,8 @@ Index: josm/build.xml
<fileset dir="${test.dir}/lib">
Index: josm/i18n/build.xml
===================================================================
---- josm.orig/i18n/build.xml 2011-08-07 13:23:59.000000000 +0200
-+++ josm/i18n/build.xml 2011-08-07 13:24:09.000000000 +0200
+--- josm.orig/i18n/build.xml 2011-08-07 13:27:53.000000000 +0200
++++ josm/i18n/build.xml 2011-08-07 23:57:23.000000000 +0200
@@ -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 2fcf622..0e48d98 100644
--- a/debian/patches/90-fix_version.patch
+++ b/debian/patches/90-fix_version.patch
@@ -10,9 +10,9 @@ Forwarded: not-needed
Index: josm/build.xml
===================================================================
---- josm.orig/build.xml 2011-08-07 00:51:19.000000000 +0200
-+++ josm/build.xml 2011-08-07 11:15:33.000000000 +0200
-@@ -72,7 +72,7 @@
+--- josm.orig/build.xml 2011-08-08 00:25:06.000000000 +0200
++++ josm/build.xml 2011-08-08 00:25:06.000000000 +0200
+@@ -76,7 +76,7 @@
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a
non-bzip2 supporting jar -->
<manifest>
<attribute name="Main-class" value="JOSM"/>
@@ -20,11 +20,11 @@ Index: josm/build.xml
+ <attribute name="Main-Version"
value="${version.entry.commit.revision}"/>
<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 /usr/share/java/signpost-core.jar"/>
+ <attribute name="Class-Path"
value="${classpath}"/>
Index: josm/src/org/openstreetmap/josm/data/Version.java
===================================================================
---- josm.orig/src/org/openstreetmap/josm/data/Version.java 2011-08-07
01:04:13.000000000 +0200
-+++ josm/src/org/openstreetmap/josm/data/Version.java 2011-08-07
11:14:35.000000000 +0200
+--- josm.orig/src/org/openstreetmap/josm/data/Version.java 2011-08-08
00:25:06.000000000 +0200
++++ josm/src/org/openstreetmap/josm/data/Version.java 2011-08-08
00:25:06.000000000 +0200
@@ -205,9 +205,6 @@
public String getAgentString() {
int v = getVersion();
--
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
