[josm] 10/11: Refresh patches.
Bas Couwenberg
sebastic at xs4all.nl
Mon Dec 29 23:09:10 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository josm.
commit bceb3bded673c0328dce8467e18fbd022eb4e0ee
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Dec 29 23:06:05 2014 +0100
Refresh patches.
---
debian/changelog | 1 +
debian/patches/00-build.patch | 26 ++++++++++++++------------
debian/patches/02-elemstyles.patch | 4 ++--
debian/patches/04-use_system_jmapviewer.patch | 2 +-
debian/patches/05-fix_version.patch | 2 +-
debian/patches/06-move_data_out_of_jar.patch | 21 +++++++++++----------
6 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 74718d9..5df365d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ josm (0.0.svn7906+dfsg2-1) UNRELEASED; urgency=medium
its bzip2 support is now used instead of Apache Ant.
* Install upstream man page.
* Also remove Windows installer from upstream tarball.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at xs4all.nl> Mon, 29 Dec 2014 22:04:46 +0100
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 6012beb..3170b63 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,19 @@
+@@ -25,6 +26,20 @@
<condition property="isWindows">
<os family="Windows"/>
</condition>
@@ -34,6 +34,7 @@ JARs and not depend on Internet connection.
+ <include name="signpost-core.jar"/>
+ <include name="ant.jar"/>
+ <include name="commons-codec.jar"/>
++ <include name="commons-compress.jar"/>
+ <include name="jmapviewer.jar"/>
+ </fileset>
+ </path>
@@ -41,7 +42,7 @@ JARs and not depend on Internet connection.
<!--
** Used by Eclipse ant builder for updating
-@@ -71,10 +85,9 @@
+@@ -71,10 +86,9 @@
<!--
** Creates the REVISION file to be included in the distribution
-->
@@ -54,7 +55,7 @@ JARs and not depend on Internet connection.
<tstamp>
<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
-@@ -87,6 +100,7 @@
+@@ -87,6 +101,7 @@
Revision: ${version.entry.commit.revision}
Is-Local-Build: true
Build-Date: ${build.tstamp}
@@ -62,7 +63,7 @@ JARs and not depend on Internet connection.
</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 -->
@@ -72,7 +73,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 +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"/>
@@ -81,7 +82,7 @@ JARs and not depend on Internet connection.
</manifest>
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
-@@ -179,10 +196,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"/>
@@ -93,12 +94,13 @@ JARs and not depend on Internet connection.
<arg value="-DEBUG_PARSER=false"/>
<arg value="-DEBUG_TOKEN_MANAGER=false"/>
<arg value="-JDK_VERSION=1.7"/>
-@@ -207,14 +221,10 @@ Build-Date: ${build.tstamp}
+@@ -214,15 +229,10 @@ Build-Date: ${build.tstamp}
</exec>
</target>
<target name="compile" depends="init,javacc,jaxb">
- <!-- COTS -->
-- <javac srcdir="${src.dir}" includes="com/**,oauth/**,org/apache/commons/codec/**,org/glassfish/**" nowarn="on"
+- <javac srcdir="${src.dir}" includes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on"
+- excludes="org/apache/commons/compress/compressors/lzma/**,org/apache/commons/compress/compressors/xz/**,org/apache/commons/compress/compressors/CompressorStreamFactory.java,org/apache/commons/compress/compressors/deflate/**,org/apache/commons/compress/compressors/gzip/**,org/apache/commons/compress/compressors/lzw/**,org/apache/commons/compress/compressors/pack200/**,org/apache/commons/compress/compressors/snappy/**,org/apache/commons/compress/compressors/z/**"
- destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="iso-8859-1">
- <!-- get rid of "internal proprietary API" warning -->
- <compilerarg value="-XDignore.symbol.file"/>
@@ -106,12 +108,12 @@ JARs and not depend on Internet connection.
+ <!-- I18N -->
+ <ant dir="i18n" />
<!-- JMapViewer/JOSM -->
-- <javac srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/codec/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
-+ <javac srcdir="${src.dir}" classpathref="classpath" excludes="com/**,oauth/**,org/apache/commons/codec/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
+- <javac srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
++ <javac srcdir="${src.dir}" classpathref="classpath" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
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"/>
-@@ -243,6 +253,7 @@ Build-Date: ${build.tstamp}
+@@ -251,6 +261,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="build"/>
<mkdir dir="dist"/>
@@ -119,7 +121,7 @@ JARs and not depend on Internet connection.
</target>
<target name="javadoc">
<javadoc destdir="javadoc"
-@@ -264,6 +275,7 @@ Build-Date: ${build.tstamp}
+@@ -272,6 +283,7 @@ Build-Date: ${build.tstamp}
<delete dir="dist"/>
<delete dir="${mapcss.dir}/parsergen"/>
<delete dir="${imagerytypes.dir}"/>
diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch
index ce398b1..80c41bf 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -15,7 +15,7 @@ applications. This patch points josm to the shared directories.
--- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-@@ -191,14 +191,19 @@ public final class MapPaintStyles {
+@@ -202,14 +202,19 @@ public final class MapPaintStyles {
}
if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) {
@@ -85,7 +85,7 @@ applications. This patch points josm to the shared directories.
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
-@@ -1516,12 +1517,22 @@ public final class TaggingPresetItems {
+@@ -1518,12 +1519,22 @@ public final class TaggingPresetItems {
}
protected static ImageIcon loadImageIcon(String iconName, File zipIcons, Integer maxSize) {
diff --git a/debian/patches/04-use_system_jmapviewer.patch b/debian/patches/04-use_system_jmapviewer.patch
index 87e5e72..5880982 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
-@@ -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 e0b8482..e094e06 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
-@@ -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 93272bd..78f5b3c 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -21,7 +21,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608
import java.nio.charset.StandardCharsets;
import java.text.MessageFormat;
import java.util.ArrayList;
-@@ -317,7 +318,11 @@ public final class I18n {
+@@ -345,7 +346,11 @@ public final class I18n {
}
private static URL getTranslationFile(String lang) {
@@ -36,31 +36,32 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608
/**
--- a/src/org/openstreetmap/josm/io/CachedFile.java
+++ b/src/org/openstreetmap/josm/io/CachedFile.java
-@@ -170,11 +170,17 @@ public class CachedFile {
+@@ -172,11 +172,17 @@ public class CachedFile {
File file = getFile();
if (file == null) {
if (name.startsWith("resource://")) {
- InputStream is = getClass().getResourceAsStream(
+- name.substring("resource:/".length()));
+- if (is == null)
+- throw new IOException(tr("Failed to open input stream for resource ''{0}''", name));
+- return is;
+ String path = name.substring("resource://".length());
+ File fileRes = new File("/usr/share/josm/" + path);
+ if (fileRes.exists()) {
+ file = fileRes;
+ } else {
+ InputStream is = getClass().getResourceAsStream(
- name.substring("resource:/".length()));
-- if (is == null)
-- throw new IOException(tr("Failed to open input stream for resource ''{0}''", name));
-- return is;
++ name.substring("resource:/".length()));
+ if (is == null)
+ throw new IOException(tr("Failed to open input stream for resource ''{0}''", name));
+ return is;
+ }
- } else throw new IOException();
- }
- return new FileInputStream(file);
+ } else {
+ throw new IOException("No file found for: "+name);
+ }
--- 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