[josm] 07/10: Refresh patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Mar 1 21:39:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit 36c2cd982c347d00c567f366f3ac82fdd92a07c5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Mar 1 09:21:06 2016 +0100
Refresh patches.
---
debian/changelog | 1 +
debian/patches/00-build.patch | 117 +++++++++++++-------------
debian/patches/01-bts.patch | 8 +-
debian/patches/02-elemstyles.patch | 4 +-
debian/patches/03-default_look_and_feel.patch | 2 +-
debian/patches/04-use_system_jmapviewer.patch | 2 +-
debian/patches/05-fix_version.patch | 2 +-
debian/patches/06-move_data_out_of_jar.patch | 4 +-
debian/patches/07-use_system_fonts.patch | 2 +-
debian/patches/08-use_noto_font.patch | 4 +-
10 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 59b4eb5..b463632 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ josm (0.0.svn9900+dfsg-1) UNRELEASED; urgency=medium
* Update copyright file, changes:
- Add license & copyright for test validation routines
- Drop © character from copyright statements
+ * Refresh patches.
-- Bas Couwenberg <sebastic at debian.org> Tue, 01 Mar 2016 06:34:35 +0100
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index f95e786..6cc6211 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -9,50 +9,50 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -15,7 +15,8 @@
- <property name="javacc.home" location="tools"/>
- <property name="mapcss.dir" location="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss"/>
- <property name="epsg.output" location="data/projection/custom-epsg"/>
-- <property name="groovy.jar" location="tools/groovy-all-2.4.5.jar"/>
-+ <property name="antcontrib.jar" value="/usr/share/java/ant-contrib.jar"/>
-+ <property name="groovy.jar" location="/usr/share/java/groovy-all-2.x.jar"/>
- <!-- build parameter: compression level (ant -Dclevel=N)
- N ranges from 0 (no compression) to 9 (maximum compression)
- default: 9 -->
-@@ -26,6 +27,19 @@
- <condition property="isJava9">
- <equals arg1="${ant.java.version}" arg2="1.9" />
- </condition>
-+ <!-- Java classpath addition (all jar files to compile tests with this) -->
-+ <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"/>
-+ <include name="commons-logging.jar"/>
-+ <include name="jmapviewer.jar"/>
-+ </fileset>
-+ </path>
-+ <property name="classpathprop-colon" refid="classpath"/>
-
- <!--
- ** Used by Eclipse ant builder for updating
-@@ -72,10 +86,9 @@
+@@ -24,7 +24,8 @@
+ <property name="mapcss.dir" location="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss"/>
+ <property name="proj-build.dir" location="${base.dir}/build2"/>
+ <property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
+- <property name="groovy.jar" location="${base.dir}/tools/groovy-all-2.4.6.jar"/>
++ <property name="antcontrib.jar" value="/usr/share/java/ant-contrib.jar"/>
++ <property name="groovy.jar" location="/usr/share/java/groovy-all-2.x.jar"/>
+ <!-- build parameter: compression level (ant -Dclevel=N)
+ N ranges from 0 (no compression) to 9 (maximum compression)
+ default: 9 -->
+@@ -35,6 +36,19 @@
+ <condition property="isJava9">
+ <equals arg1="${ant.java.version}" arg2="1.9" />
+ </condition>
++ <!-- Java classpath addition (all jar files to compile tests with this) -->
++ <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"/>
++ <include name="commons-logging.jar"/>
++ <include name="jmapviewer.jar"/>
++ </fileset>
++ </path>
++ <property name="classpathprop-colon" refid="classpath"/>
+ <path id="test.classpath">
+ <fileset dir="${test.dir}/lib">
+ <include name="**/*.jar"/>
+@@ -90,10 +104,9 @@
<!--
** Creates the REVISION file to be included in the distribution
-->
-- <target name="create-revision" depends="init-svn-revision-xml, init-git-revision-xml">
+- <target name="create-revision" depends="init-properties,init-svn-revision-xml,init-git-revision-xml">
+ <target name="create-revision">
<property name="revision.dir" value="${build.dir}"/>
-- <xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
-- <delete file="REVISION.XML"/>
+- <xmlproperty file="${base.dir}/REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
+- <delete file="${base.dir}/REVISION.XML"/>
+ <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
<tstamp>
<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
-@@ -86,8 +99,10 @@
+@@ -104,8 +117,10 @@
<echo file="${revision.dir}/REVISION">
# automatically generated by JOSM build.xml - do not edit
Revision: ${version.entry.commit.revision}
@@ -64,17 +64,16 @@ Forwarded: not-needed
</echo>
</target>
<!--
-@@ -107,7 +122,8 @@ Build-Date: ${build.tstamp}
+@@ -125,7 +140,7 @@ Build-Date: ${build.tstamp}
<copy file="README" todir="build"/>
<copy file="LICENSE" todir="build"/>
<!-- create josm-custom.jar -->
-- <delete file="dist/josm-custom.jar"/>
-+ <propertyregex property="classpathprop" input="${classpathprop-colon}" global="true"
-+ regexp=":" replace=" "/>
- <jar destfile="dist/josm-custom.jar" basedir="build" level="${clevel}">
+- <delete file="${dist.dir}/josm-custom.jar"/>
++ <propertyregex property="classpathprop" input="${classpathprop-colon}" global="true" regexp=":" replace=" "/>
+ <jar destfile="${dist.dir}/josm-custom.jar" basedir="${build.dir}" level="${clevel}">
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
-@@ -117,6 +133,8 @@ Build-Date: ${build.tstamp}
+@@ -135,6 +150,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"/>
@@ -83,7 +82,7 @@ Forwarded: not-needed
</manifest>
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
-@@ -187,10 +205,7 @@ Build-Date: ${build.tstamp}
+@@ -205,10 +222,7 @@ Build-Date: ${build.tstamp}
</target>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
@@ -95,7 +94,7 @@ Forwarded: not-needed
<arg value="-DEBUG_PARSER=false"/>
<arg value="-DEBUG_TOKEN_MANAGER=false"/>
<arg value="-JDK_VERSION=1.7"/>
-@@ -201,31 +216,19 @@ Build-Date: ${build.tstamp}
+@@ -219,31 +233,19 @@ Build-Date: ${build.tstamp}
</target>
<target name="compile" depends="init,javacc">
<!-- COTS -->
@@ -126,44 +125,44 @@ Forwarded: not-needed
+ <!-- I18N -->
+ <ant dir="i18n" />
<!-- JMapViewer -->
-- <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**"
+- <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**"
+ <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**"
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"/>
-@@ -242,7 +245,7 @@ Build-Date: ${build.tstamp}
+@@ -260,7 +262,7 @@ Build-Date: ${build.tstamp}
<compilerarg value="-XDignore.symbol.file"/>
</javac>
<!-- JOSM -->
-- <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
+- <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
+ <javac sourcepath="" 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"/>
-@@ -269,6 +272,7 @@ Build-Date: ${build.tstamp}
+@@ -287,6 +289,7 @@ Build-Date: ${build.tstamp}
</uptodate>
- <mkdir dir="build"/>
- <mkdir dir="dist"/>
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${dist.dir}"/>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${antcontrib.jar}"/>
</target>
- <target name="javadoc">
- <javadoc destdir="javadoc"
-@@ -294,6 +298,7 @@ Build-Date: ${build.tstamp}
+ <target name="javadoc" depends="init-properties">
+ <javadoc destdir="javadoc"
+@@ -312,6 +315,7 @@ Build-Date: ${build.tstamp}
<delete file="${src.dir}/org/w3/_2001/xmlschema/Adapter1.java"/>
<delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
<delete file="${epsg.output}"/>
+ <ant target="clean" dir="i18n"/>
</target>
- <path id="test.classpath">
- <fileset dir="${test.dir}/lib">
-@@ -659,6 +664,7 @@ Build-Date: ${build.tstamp}
- <pathelement path="."/>
- <pathelement path="build"/>
- <pathelement path="build2"/>
+ <macrodef name="init-test-preferences">
+ <attribute name="testfamily"/>
+@@ -710,6 +714,7 @@ Build-Date: ${build.tstamp}
+ <pathelement path="${base.dir}"/>
+ <pathelement path="${proj-classpath}"/>
+ <pathelement path="${proj-build.dir}"/>
+ <path refid="classpath"/>
</classpath>
+ <arg value="${base.dir}"/>
</java>
- </target>
--- a/i18n/build.xml
+++ b/i18n/build.xml
@@ -1,7 +1,7 @@
diff --git a/debian/patches/01-bts.patch b/debian/patches/01-bts.patch
index 435d41e..76ca1d7 100644
--- a/debian/patches/01-bts.patch
+++ b/debian/patches/01-bts.patch
@@ -46,7 +46,7 @@ Forwarded: not-needed
private String time;
private String buildName;
private boolean isLocalBuild;
-@@ -74,6 +75,8 @@ public class Version {
+@@ -73,6 +74,8 @@ public class Version {
version = JOSM_UNKNOWN_VERSION;
}
@@ -55,7 +55,7 @@ Forwarded: not-needed
// the last changed data
//
time = properties.getProperty("Last Changed Date");
-@@ -130,6 +133,10 @@ public class Version {
+@@ -132,6 +135,10 @@ public class Version {
return version == 0 ? tr("UNKNOWN") : Integer.toString(version);
}
@@ -110,7 +110,7 @@ Forwarded: not-needed
text = "{{{\n"+text+"}}}";
--- a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
+++ b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
-@@ -29,6 +29,7 @@ import org.openstreetmap.josm.data.osm.D
+@@ -29,6 +29,7 @@ import org.openstreetmap.josm.data.prefe
import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.widgets.JosmTextArea;
import org.openstreetmap.josm.plugins.PluginHandler;
@@ -118,7 +118,7 @@ Forwarded: not-needed
import org.openstreetmap.josm.tools.PlatformHookUnixoid;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.Utils;
-@@ -198,7 +199,7 @@ public final class ShowStatusReportActio
+@@ -199,7 +200,7 @@ public final class ShowStatusReportActio
switch (ed.showDialog().getValue()) {
case 1: Utils.copyToClipboard(text.toString()); break;
diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch
index b60585d..1da0bf9 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
--- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-@@ -234,14 +234,19 @@ public final class MapPaintStyles {
+@@ -232,14 +232,19 @@ public final class MapPaintStyles {
}
if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) {
@@ -85,7 +85,7 @@ Forwarded: not-needed
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
import org.openstreetmap.josm.tools.ImageProvider;
-@@ -124,11 +126,21 @@ public abstract class TaggingPresetItem
+@@ -126,11 +128,21 @@ public abstract class TaggingPresetItem
}
protected static ImageIcon loadImageIcon(String iconName, File zipIcons, Integer maxSize) {
diff --git a/debian/patches/03-default_look_and_feel.patch b/debian/patches/03-default_look_and_feel.patch
index a3ec1e7..23d15a5 100644
--- a/debian/patches/03-default_look_and_feel.patch
+++ b/debian/patches/03-default_look_and_feel.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
--- a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
-@@ -161,7 +161,7 @@ public class PlatformHookUnixoid impleme
+@@ -165,7 +165,7 @@ public class PlatformHookUnixoid impleme
@Override
public String getDefaultStyle() {
diff --git a/debian/patches/04-use_system_jmapviewer.patch b/debian/patches/04-use_system_jmapviewer.patch
index f511d9d..9f2b131 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
-@@ -139,7 +139,6 @@ Debian-Release: ${debian.version}
+@@ -156,7 +156,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 802bff3..8079694 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
-@@ -128,7 +128,7 @@ Debian-Release: ${debian.version}
+@@ -145,7 +145,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 ee89b2f..1fbda08 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -29,7 +29,7 @@ Forwarded: not-needed
/**
--- a/src/org/openstreetmap/josm/io/CachedFile.java
+++ b/src/org/openstreetmap/josm/io/CachedFile.java
-@@ -186,11 +186,17 @@ public class CachedFile {
+@@ -199,11 +199,17 @@ public class CachedFile implements Close
File file = getFile();
if (file == null) {
if (name.startsWith("resource://")) {
@@ -54,7 +54,7 @@ Forwarded: not-needed
}
--- a/build.xml
+++ b/build.xml
-@@ -136,9 +136,9 @@ Debian-Release: ${debian.version}
+@@ -153,9 +153,9 @@ Debian-Release: ${debian.version}
<attribute name="Debian-Release" value="${debian.version}"/>
<attribute name="Class-Path" value="${classpathprop}"/>
</manifest>
diff --git a/debian/patches/07-use_system_fonts.patch b/debian/patches/07-use_system_fonts.patch
index e680946..9e31fe1 100644
--- a/debian/patches/07-use_system_fonts.patch
+++ b/debian/patches/07-use_system_fonts.patch
@@ -22,6 +22,6 @@ Forwarded: not-needed
for (String fontFile : INCLUDED_FONTS) {
- String url = "resource://data/fonts/"+fontFile;
+ String url = "/usr/share/fonts/truetype/noto/"+fontFile;
- try (InputStream i = new CachedFile(url).getInputStream()) {
+ try (CachedFile cf = new CachedFile(url); InputStream i = cf.getInputStream()) {
ge.registerFont(Font.createFont(Font.TRUETYPE_FONT, i));
} catch (IOException | FontFormatException ex) {
diff --git a/debian/patches/08-use_noto_font.patch b/debian/patches/08-use_noto_font.patch
index 4d810f1..64384b0 100644
--- a/debian/patches/08-use_noto_font.patch
+++ b/debian/patches/08-use_noto_font.patch
@@ -5,7 +5,7 @@ Forwarded: https://josm.openstreetmap.de/ticket/12085
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
-@@ -1532,7 +1532,7 @@ public class StyledMapRenderer extends A
+@@ -1562,7 +1562,7 @@ public class StyledMapRenderer extends A
showNames = paintSettings.getShowNamesDistance() > circum;
showIcons = paintSettings.getShowIconsDistance() > circum;
isOutlineOnly = paintSettings.isOutlineOnly();
@@ -16,7 +16,7 @@ Forwarded: https://josm.openstreetmap.de/ticket/12085
RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF;
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
-@@ -123,7 +123,7 @@ public abstract class StyleElement imple
+@@ -127,7 +127,7 @@ public abstract class StyleElement imple
synchronized (lock) {
n = DEFAULT_FONT_NAME;
if (n == null) {
--
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