[josm] 01/02: Add commons-codec.jar to classpath again, required for signpost-core.jar.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Wed Nov 4 18:59:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit bffedf350c24b9b913559358f0fea7773a4da192
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Nov 4 19:38:27 2015 +0100
Add commons-codec.jar to classpath again, required for signpost-core.jar.
---
debian/changelog | 6 ++++++
debian/patches/00-build.patch | 21 +++++++++++----------
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 +-
5 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 901d844..4282e71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn8969+dfsg-3) UNRELEASED; urgency=medium
+
+ * Add commons-codec.jar to classpath again, required for signpost-core.jar.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 04 Nov 2015 19:36:54 +0100
+
josm (0.0.svn8969+dfsg-2) unstable; urgency=medium
* Drop libandroid-json-org-java & libcommons-codec-java dependencies,
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index bdee001..161576e 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -19,7 +19,7 @@ Forwarded: not-needed
<!-- build parameter: compression level (ant -Dclevel=N)
N ranges from 0 (no compression) to 9 (maximum compression)
default: 9 -->
-@@ -25,6 +26,18 @@
+@@ -25,6 +26,19 @@
<condition property="isJava9">
<equals arg1="${ant.java.version}" arg2="1.9" />
</condition>
@@ -29,6 +29,7 @@ Forwarded: not-needed
+ <include name="gettext-commons.jar"/>
+ <include name="svgSalamander.jar"/>
+ <include name="signpost-core.jar"/>
++ <include name="commons-codec.jar"/>
+ <include name="commons-compress.jar"/>
+ <include name="commons-logging.jar"/>
+ <include name="jmapviewer.jar"/>
@@ -38,7 +39,7 @@ Forwarded: not-needed
<!--
** Used by Eclipse ant builder for updating
-@@ -71,10 +84,9 @@
+@@ -71,10 +85,9 @@
<!--
** Creates the REVISION file to be included in the distribution
-->
@@ -51,7 +52,7 @@ Forwarded: not-needed
<tstamp>
<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
-@@ -85,8 +97,10 @@
+@@ -85,8 +98,10 @@
<echo file="${revision.dir}/REVISION">
# automatically generated by JOSM build.xml - do not edit
Revision: ${version.entry.commit.revision}
@@ -63,7 +64,7 @@ Forwarded: not-needed
</echo>
</target>
<!--
-@@ -106,7 +120,8 @@ Build-Date: ${build.tstamp}
+@@ -106,7 +121,8 @@ Build-Date: ${build.tstamp}
<copy file="README" todir="build"/>
<copy file="LICENSE" todir="build"/>
<!-- create josm-custom.jar -->
@@ -73,7 +74,7 @@ Forwarded: not-needed
<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 +131,8 @@ Build-Date: ${build.tstamp}
+@@ -116,6 +132,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 +83,7 @@ Forwarded: not-needed
</manifest>
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
-@@ -186,10 +203,7 @@ Build-Date: ${build.tstamp}
+@@ -186,10 +204,7 @@ Build-Date: ${build.tstamp}
</target>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
@@ -94,7 +95,7 @@ Forwarded: not-needed
<arg value="-DEBUG_PARSER=false"/>
<arg value="-DEBUG_TOKEN_MANAGER=false"/>
<arg value="-JDK_VERSION=1.7"/>
-@@ -200,31 +214,19 @@ Build-Date: ${build.tstamp}
+@@ -200,31 +215,19 @@ Build-Date: ${build.tstamp}
</target>
<target name="compile" depends="init,javacc">
<!-- COTS -->
@@ -130,7 +131,7 @@ Forwarded: not-needed
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"/>
-@@ -241,7 +243,7 @@ Build-Date: ${build.tstamp}
+@@ -241,7 +244,7 @@ Build-Date: ${build.tstamp}
<compilerarg value="-XDignore.symbol.file"/>
</javac>
<!-- JOSM -->
@@ -139,7 +140,7 @@ Forwarded: not-needed
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"/>
-@@ -268,6 +270,7 @@ Build-Date: ${build.tstamp}
+@@ -268,6 +271,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="build"/>
<mkdir dir="dist"/>
@@ -147,7 +148,7 @@ Forwarded: not-needed
</target>
<target name="javadoc">
<javadoc destdir="javadoc"
-@@ -290,6 +293,7 @@ Build-Date: ${build.tstamp}
+@@ -290,6 +294,7 @@ Build-Date: ${build.tstamp}
<delete dir="${mapcss.dir}/parsergen"/>
<delete file="${src.dir}/org/w3/_2001/xmlschema/Adapter1.java"/>
<delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
diff --git a/debian/patches/04-use_system_jmapviewer.patch b/debian/patches/04-use_system_jmapviewer.patch
index 9ce2f16..e74df7e 100644
--- a/debian/patches/04-use_system_jmapviewer.patch
+++ b/debian/patches/04-use_system_jmapviewer.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -137,7 +137,6 @@ Debian-Release: ${debian.version}
+@@ -138,7 +138,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 b1fead2..5149fbd 100644
--- a/debian/patches/05-fix_version.patch
+++ b/debian/patches/05-fix_version.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -126,7 +126,7 @@ Debian-Release: ${debian.version}
+@@ -127,7 +127,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 1cb6cd3..d35fdd5 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -54,7 +54,7 @@ Forwarded: not-needed
}
--- a/build.xml
+++ b/build.xml
-@@ -134,9 +134,9 @@ Debian-Release: ${debian.version}
+@@ -135,9 +135,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