Commit 439f4ef4 authored by Bas Couwenberg's avatar Bas Couwenberg

Use embedded svgsalamander for setImageDataInlineOnly symbol.

parent 5b9c2811
josm (0.0.svn14289+dfsg-2) UNRELEASED; urgency=medium
* Use embedded svgsalamander for setImageDataInlineOnly symbol.
-- Bas Couwenberg <sebastic@debian.org> Mon, 29 Oct 2018 07:19:09 +0100
josm (0.0.svn14289+dfsg-1) unstable; urgency=medium
* New tested snapshot.
......
......@@ -18,7 +18,6 @@ Build-Depends: debhelper (>= 9~),
libgettext-ant-tasks-java,
libgettext-commons-java (>= 0.9.6),
liboauth-signpost-java (>= 1.2),
libsvgsalamander-java,
libterm-readkey-perl
# openjfx
Standards-Version: 4.2.1
......@@ -35,7 +34,6 @@ Depends: default-jre (>= 2:1.9) | java9-runtime,
libcommons-logging-java,
libgettext-commons-java (>= 0.9.6),
liboauth-signpost-java (>= 1.2),
libsvgsalamander-java,
# openjfx,
proj-data,
${misc:Depends}
......
......@@ -17,7 +17,7 @@ Forwarded: not-needed
<property name="error_prone_core.jar" location="${tools.dir}/error_prone_core.jar"/>
<property name="error_prone_javac.jar" location="${tools.dir}/error_prone_javac.jar"/>
<property name="jformatstring.jar" location="${spotbugs.dir}/jFormatString-3.0.0.jar"/>
@@ -71,10 +72,23 @@
@@ -71,10 +72,22 @@
<isset property="isJava9"/>
</condition>
<path id="groovy.classpath">
......@@ -31,7 +31,6 @@ Forwarded: not-needed
+ <path id="classpath">
+ <fileset dir="/usr/share/java">
+ <include name="gettext-commons.jar"/>
+ <include name="svgSalamander.jar"/>
+ <include name="signpost-core.jar"/>
+ <include name="commons-codec.jar"/>
+ <include name="commons-compress.jar"/>
......@@ -43,7 +42,7 @@ Forwarded: not-needed
<path id="test.classpath">
<fileset dir="${test.dir}/lib">
<include name="**/*.jar"/>
@@ -141,10 +155,9 @@
@@ -141,10 +154,9 @@
<!--
** Creates the REVISION file to be included in the distribution
-->
......@@ -56,7 +55,7 @@ Forwarded: not-needed
<tstamp>
<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
@@ -155,8 +168,10 @@
@@ -155,8 +167,10 @@
<echo file="${revision.dir}/REVISION">
# automatically generated by JOSM build.xml - do not edit
Revision: ${version.entry.commit.revision}
......@@ -68,7 +67,7 @@ Forwarded: not-needed
</echo>
</target>
<!--
@@ -176,7 +191,7 @@ Build-Date: ${build.tstamp}
@@ -176,7 +190,7 @@ Build-Date: ${build.tstamp}
<copy file="README" todir="${build.dir}"/>
<copy file="LICENSE" todir="${build.dir}"/>
<!-- create josm-custom.jar -->
......@@ -77,7 +76,7 @@ Forwarded: not-needed
<jar destfile="${dist.jar}" basedir="${build.dir}" level="${clevel}">
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
@@ -186,6 +201,8 @@ Build-Date: ${build.tstamp}
@@ -186,6 +200,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"/>
......@@ -86,7 +85,7 @@ Forwarded: not-needed
<!-- Java 9 stuff. Entries are safely ignored by Java 8 -->
<attribute name="Add-Exports" value="java.base/sun.security.util java.base/sun.security.x509 java.desktop/com.apple.eawt java.desktop/com.sun.imageio.spi javafx.graphics/com.sun.javafx.application jdk.deploy/com.sun.deploy.config" />
<attribute name="Add-Opens" value="java.base/java.lang java.base/java.nio java.base/jdk.internal.loader java.base/jdk.internal.ref java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
@@ -260,43 +277,21 @@ Build-Date: ${build.tstamp}
@@ -260,43 +276,21 @@ Build-Date: ${build.tstamp}
</target>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
......@@ -133,7 +132,7 @@ Forwarded: not-needed
<exclude name="org/apache/commons/jcs/JCS.java"/>
<exclude name="org/apache/commons/jcs/access/GroupCacheAccess.java"/>
<exclude name="org/apache/commons/jcs/access/PartitionedCacheAccess.java"/>
@@ -317,22 +312,15 @@ Build-Date: ${build.tstamp}
@@ -317,22 +311,15 @@ Build-Date: ${build.tstamp}
<exclude name="org/apache/commons/jcs/utils/net/**"/>
<exclude name="org/apache/commons/jcs/utils/props/**"/>
<exclude name="org/apache/commons/jcs/utils/servlet/**"/>
......@@ -159,7 +158,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
@@ -346,19 +334,14 @@ Build-Date: ${build.tstamp}
@@ -346,19 +333,14 @@ Build-Date: ${build.tstamp}
<compilerarg value="-Xlint:unchecked"/>
<!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
<compilerarg value="-XDignore.symbol.file"/>
......@@ -180,7 +179,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
@@ -372,7 +355,6 @@ Build-Date: ${build.tstamp}
@@ -372,7 +354,6 @@ Build-Date: ${build.tstamp}
<compilerarg value="-Xlint:unchecked"/>
<!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
<compilerarg value="-XDignore.symbol.file"/>
......@@ -188,7 +187,7 @@ Forwarded: not-needed
<compilerarg line="-Xmaxwarns 1000"/>
<exclude name="org/openstreetmap/josm/io/audio/fx/*.java" if:set="noJavaFX"/>
</javac>
@@ -387,6 +369,7 @@ Build-Date: ${build.tstamp}
@@ -387,6 +368,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="${build.dir}"/>
<mkdir dir="${dist.dir}"/>
......@@ -196,7 +195,7 @@ Forwarded: not-needed
</target>
<target name="javadoc" depends="init-properties">
<javadoc destdir="javadoc"
@@ -422,6 +405,7 @@ Build-Date: ${build.tstamp}
@@ -422,6 +404,7 @@ Build-Date: ${build.tstamp}
<delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
<delete file="${epsg.output}"/>
<delete file="${pmd.dir}/cache"/>
......@@ -204,7 +203,7 @@ Forwarded: not-needed
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
@@ -984,6 +968,7 @@ Build-Date: ${build.tstamp}
@@ -984,6 +967,7 @@ Build-Date: ${build.tstamp}
<pathelement path="${base.dir}"/>
<pathelement path="${proj-classpath}"/>
<pathelement path="${proj-build.dir}"/>
......
......@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -211,7 +211,6 @@ Debian-Release: ${debian.version}
@@ -210,7 +210,6 @@ Debian-Release: ${debian.version}
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
<zipfileset dir="styles" prefix="styles"/>
......
......@@ -8,7 +8,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -196,7 +196,7 @@ Debian-Release: ${debian.version}
@@ -195,7 +195,7 @@ Debian-Release: ${debian.version}
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
<attribute name="Main-class" value="org.openstreetmap.josm.gui.MainApplication"/>
......
......@@ -6,7 +6,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -208,9 +208,6 @@ Debian-Release: ${debian.version}
@@ -207,9 +207,6 @@ Debian-Release: ${debian.version}
<attribute name="Add-Opens" value="java.base/java.lang java.base/java.nio java.base/jdk.internal.loader java.base/jdk.internal.ref java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
</manifest>
<service type="java.text.spi.DecimalFormatSymbolsProvider" provider="org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider" />
......
......@@ -73,7 +73,7 @@ get-orig-source:
@echo Downloading josm from ${SVNREPO}
svn export -r ${SVNREV} ${SVNREPO} ${DESTDIR}
@echo Removing duplicated code
rm -rf ${DESTDIR}/src/com/google ${DESTDIR}/src/com/kitfox ${DESTDIR}/src/oauth ${DESTDIR}/src/org/apache/commons/compress ${DESTDIR}/src/org/apache/commons/logging
rm -rf ${DESTDIR}/src/com/google ${DESTDIR}/src/oauth ${DESTDIR}/src/org/apache/commons/compress ${DESTDIR}/src/org/apache/commons/logging
@echo Fetching revision metadata
svn info --xml -r ${SVNREV} ${SVNREPO} > ${DESTDIR}/REVISION
@echo Fetching internalization data
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment