[josm] 17/28: Use embedded metadata-extractor for getFirstDirectoryOfType symbol.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Oct 9 22:27:04 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 181f8465fa29a5d09910a100db435201fa63c282
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Oct 9 15:27:23 2015 +0200
Use embedded metadata-extractor for getFirstDirectoryOfType symbol.
---
debian/changelog | 1 +
debian/control | 2 --
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 +-
6 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 34c112e..d601c3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ josm (0.0.svn8800+dfsg2-1) UNRELEASED; urgency=medium
* Update patches, drop disabled patches, use groovy2 package.
* Bump minimum required jmapviewer version to 1.11.
* Drop xjc command for removed wms-cache.xsd.
+ * Use embedded metadata-extractor for getFirstDirectoryOfType symbol.
-- Bas Couwenberg <sebastic at debian.org> Fri, 09 Oct 2015 15:24:23 +0200
diff --git a/debian/control b/debian/control
index e758196..cf83184 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,6 @@ Build-Depends: debhelper (>= 9~),
libcommons-logging-java,
libgettext-ant-tasks-java,
libgettext-commons-java (>= 0.9.6),
- libmetadata-extractor-java (>= 2.7.2),
liboauth-signpost-java (>= 1.2),
libsvgsalamander-java,
libterm-readkey-perl,
@@ -37,7 +36,6 @@ Depends: default-jre | java7-runtime,
libcommons-compress-java,
libcommons-logging-java,
libgettext-commons-java (>= 0.9.6),
- libmetadata-extractor-java (>= 2.7.2),
libsvgsalamander-java,
liboauth-signpost-java (>= 1.2),
openstreetmap-map-icons-classic,
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index a6d2a82..4c63fcd 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -23,7 +23,7 @@ JARs and not depend on Internet connection.
<!-- build parameter: compression level (ant -Dclevel=N)
N ranges from 0 (no compression) to 9 (maximum compression)
default: 9 -->
-@@ -29,6 +30,20 @@
+@@ -29,6 +30,19 @@
<condition property="isJava9">
<equals arg1="${ant.java.version}" arg2="1.9" />
</condition>
@@ -31,7 +31,6 @@ JARs and not depend on Internet connection.
+ <path id="classpath">
+ <fileset dir="/usr/share/java">
+ <include name="gettext-commons.jar"/>
-+ <include name="metadata-extractor.jar"/>
+ <include name="svgSalamander.jar"/>
+ <include name="signpost-core.jar"/>
+ <include name="commons-codec.jar"/>
@@ -44,7 +43,7 @@ JARs and not depend on Internet connection.
<!--
** Used by Eclipse ant builder for updating
-@@ -75,10 +90,9 @@
+@@ -75,10 +89,9 @@
<!--
** Creates the REVISION file to be included in the distribution
-->
@@ -57,7 +56,7 @@ JARs and not depend on Internet connection.
<tstamp>
<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
-@@ -91,6 +105,8 @@
+@@ -91,6 +104,8 @@
Revision: ${version.entry.commit.revision}
Is-Local-Build: true
Build-Date: ${build.tstamp}
@@ -66,7 +65,7 @@ JARs and not depend on Internet connection.
</echo>
</target>
<!--
-@@ -110,7 +126,8 @@ Build-Date: ${build.tstamp}
+@@ -110,7 +125,8 @@ Build-Date: ${build.tstamp}
<copy file="README" todir="build"/>
<copy file="LICENSE" todir="build"/>
<!-- create josm-custom.jar -->
@@ -76,7 +75,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>
-@@ -120,6 +137,8 @@ Build-Date: ${build.tstamp}
+@@ -120,6 +136,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"/>
@@ -85,7 +84,7 @@ JARs and not depend on Internet connection.
</manifest>
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
-@@ -190,10 +209,7 @@ Build-Date: ${build.tstamp}
+@@ -190,10 +208,7 @@ Build-Date: ${build.tstamp}
</target>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
@@ -97,7 +96,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"/>
-@@ -204,31 +220,19 @@ Build-Date: ${build.tstamp}
+@@ -204,31 +219,19 @@ Build-Date: ${build.tstamp}
</target>
<target name="compile" depends="init,javacc">
<!-- COTS -->
@@ -133,7 +132,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"/>
-@@ -245,7 +249,7 @@ Build-Date: ${build.tstamp}
+@@ -245,7 +248,7 @@ Build-Date: ${build.tstamp}
<compilerarg value="-XDignore.symbol.file"/>
</javac>
<!-- JOSM -->
@@ -142,7 +141,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"/>
-@@ -272,6 +276,7 @@ Build-Date: ${build.tstamp}
+@@ -272,6 +275,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="build"/>
<mkdir dir="dist"/>
@@ -150,7 +149,7 @@ JARs and not depend on Internet connection.
</target>
<target name="javadoc">
<javadoc destdir="javadoc"
-@@ -294,6 +299,7 @@ Build-Date: ${build.tstamp}
+@@ -294,6 +298,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 3d58ae2..1afd126 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
-@@ -143,7 +143,6 @@ Debian-Release: ${debian.version}
+@@ -142,7 +142,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 1f1a9d6..8f1b425 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
-@@ -132,7 +132,7 @@ Debian-Release: ${debian.version}
+@@ -131,7 +131,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 7c745a0..26c61e0 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
-@@ -140,9 +140,9 @@ Debian-Release: ${debian.version}
+@@ -139,9 +139,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