[josm] 01/01: Drop runtime dependency on ant, its bzip2 support is no longer used.
Bas Couwenberg
sebastic at xs4all.nl
Sat Jan 3 20:19:07 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository josm.
commit 69b23a30bb11c9505645b21fdcec163e5dcd6279
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Jan 3 20:17:32 2015 +0100
Drop runtime dependency on ant, its bzip2 support is no longer used.
---
debian/changelog | 6 ++++++
debian/control | 1 -
debian/patches/00-build.patch | 19 +++++++++----------
debian/patches/04-use_system_jmapviewer.patch | 2 +-
debian/patches/05-fix_version.patch | 2 +-
debian/patches/06-move_data_out_of_jar.patch | 2 +-
6 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index af00515..54d2fb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn7906+dfsg2-1~exp2) UNRELEASED; urgency=medium
+
+ * Drop runtime dependency on ant, its bzip2 support is no longer used.
+
+ -- Bas Couwenberg <sebastic at xs4all.nl> Sat, 03 Jan 2015 20:16:51 +0100
+
josm (0.0.svn7906+dfsg2-1~exp1) experimental; urgency=medium
* New tested snapshot.
diff --git a/debian/control b/debian/control
index c344c59..9a6b75c 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,6 @@ Depends: default-jre | java7-runtime,
liboauth-signpost-java (>= 1.2),
libsvgsalamander-java,
openstreetmap-map-icons-classic,
- ant,
libandroid-json-org-java,
jmapviewer (>= 1.05),
fonts-droid,
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 3170b63..f2b5c87 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -21,7 +21,7 @@ JARs and not depend on Internet connection.
<property name="imagerytypes.dir" location="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
<!-- build parameter: compression level (ant -Dclevel=N)
N ranges from 0 (no compression) to 9 (maximum compression)
-@@ -25,6 +26,20 @@
+@@ -25,6 +26,19 @@
<condition property="isWindows">
<os family="Windows"/>
</condition>
@@ -32,7 +32,6 @@ JARs and not depend on Internet connection.
+ <include name="metadata-extractor.jar"/>
+ <include name="svgSalamander.jar"/>
+ <include name="signpost-core.jar"/>
-+ <include name="ant.jar"/>
+ <include name="commons-codec.jar"/>
+ <include name="commons-compress.jar"/>
+ <include name="jmapviewer.jar"/>
@@ -42,7 +41,7 @@ JARs and not depend on Internet connection.
<!--
** Used by Eclipse ant builder for updating
-@@ -71,10 +86,9 @@
+@@ -71,10 +85,9 @@
<!--
** Creates the REVISION file to be included in the distribution
-->
@@ -55,7 +54,7 @@ JARs and not depend on Internet connection.
<tstamp>
<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
-@@ -87,6 +101,7 @@
+@@ -87,6 +100,7 @@
Revision: ${version.entry.commit.revision}
Is-Local-Build: true
Build-Date: ${build.tstamp}
@@ -63,7 +62,7 @@ JARs and not depend on Internet connection.
</echo>
</target>
<!--
-@@ -106,7 +121,8 @@ Build-Date: ${build.tstamp}
+@@ -106,7 +120,8 @@ Build-Date: ${build.tstamp}
<copy file="README" todir="build"/>
<copy file="LICENSE" todir="build"/>
<!-- create josm-custom.jar -->
@@ -73,7 +72,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>
-@@ -116,6 +132,8 @@ Build-Date: ${build.tstamp}
+@@ -116,6 +131,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"/>
@@ -82,7 +81,7 @@ JARs and not depend on Internet connection.
</manifest>
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
-@@ -186,10 +204,7 @@ Build-Date: ${build.tstamp}
+@@ -186,10 +203,7 @@ Build-Date: ${build.tstamp}
</target>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
@@ -94,7 +93,7 @@ JARs and not depend on Internet connection.
<arg value="-DEBUG_PARSER=false"/>
<arg value="-DEBUG_TOKEN_MANAGER=false"/>
<arg value="-JDK_VERSION=1.7"/>
-@@ -214,15 +229,10 @@ Build-Date: ${build.tstamp}
+@@ -214,15 +228,10 @@ Build-Date: ${build.tstamp}
</exec>
</target>
<target name="compile" depends="init,javacc,jaxb">
@@ -113,7 +112,7 @@ JARs and not depend on Internet connection.
destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
-@@ -251,6 +261,7 @@ Build-Date: ${build.tstamp}
+@@ -251,6 +260,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="build"/>
<mkdir dir="dist"/>
@@ -121,7 +120,7 @@ JARs and not depend on Internet connection.
</target>
<target name="javadoc">
<javadoc destdir="javadoc"
-@@ -272,6 +283,7 @@ Build-Date: ${build.tstamp}
+@@ -272,6 +282,7 @@ Build-Date: ${build.tstamp}
<delete dir="dist"/>
<delete dir="${mapcss.dir}/parsergen"/>
<delete dir="${imagerytypes.dir}"/>
diff --git a/debian/patches/04-use_system_jmapviewer.patch b/debian/patches/04-use_system_jmapviewer.patch
index 5880982..87e5e72 100644
--- a/debian/patches/04-use_system_jmapviewer.patch
+++ b/debian/patches/04-use_system_jmapviewer.patch
@@ -10,7 +10,7 @@ Forwarded: no
--- a/build.xml
+++ b/build.xml
-@@ -138,7 +138,6 @@ Debian-Release: ${debian.version}
+@@ -137,7 +137,6 @@ Debian-Release: ${debian.version}
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
<zipfileset dir="styles" prefix="styles"/>
diff --git a/debian/patches/05-fix_version.patch b/debian/patches/05-fix_version.patch
index 94df90c..308d75a 100644
--- a/debian/patches/05-fix_version.patch
+++ b/debian/patches/05-fix_version.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -127,7 +127,7 @@ Debian-Release: ${debian.version}
+@@ -126,7 +126,7 @@ Debian-Release: ${debian.version}
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
<attribute name="Main-class" value="JOSM"/>
diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch
index 78f5b3c..03a6ad2 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -61,7 +61,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608
}
--- a/build.xml
+++ b/build.xml
-@@ -135,9 +135,9 @@ Debian-Release: ${debian.version}
+@@ -134,9 +134,9 @@ Debian-Release: ${debian.version}
<attribute name="Debian-Release" value="${debian.version}"/>
<attribute name="Class-Path" value="${classpathprop}"/>
</manifest>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git
More information about the Pkg-grass-devel
mailing list