[josm] 05/06: Refresh patches.
Bas Couwenberg
sebastic at debian.org
Tue Feb 28 07:10:45 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit 226af1d4e4c6bd1f1d637b48721c65142af3605e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Feb 28 07:55:53 2017 +0100
Refresh patches.
---
debian/changelog | 1 +
debian/patches/00-build.patch | 23 ++++++++++++-----------
debian/patches/08-use_noto_font.patch | 2 +-
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d46b5b9..2ff5800 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ josm (0.0.svn11639+dfsg-1) UNRELEASED; urgency=medium
* New tested snapshot.
* Update public-domain i18n scripts in copyright file.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at debian.org> Tue, 28 Feb 2017 07:41:52 +0100
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 6d5dae9..c52b3ab 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -94,7 +94,7 @@ Forwarded: not-needed
<arg value="-DEBUG_PARSER=false"/>
<arg value="-DEBUG_TOKEN_MANAGER=false"/>
<arg value="-JDK_VERSION=1.8"/>
-@@ -221,25 +235,10 @@ Build-Date: ${build.tstamp}
+@@ -221,26 +235,10 @@ Build-Date: ${build.tstamp}
</target>
<target name="compile" depends="init,javacc">
<!-- COTS -->
@@ -118,10 +118,11 @@ Forwarded: not-needed
- <exclude name="org/apache/commons/compress/compressors/pack200/**"/>
- <exclude name="org/apache/commons/compress/compressors/snappy/**"/>
- <exclude name="org/apache/commons/compress/compressors/z/**"/>
+- <exclude name="org/apache/commons/compress/utils/ArchiveUtils.java"/>
<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"/>
-@@ -260,19 +259,13 @@ Build-Date: ${build.tstamp}
+@@ -261,19 +259,13 @@ 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/**"/>
@@ -144,7 +145,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -286,16 +279,12 @@ Build-Date: ${build.tstamp}
+@@ -287,16 +279,12 @@ 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"/>
@@ -162,7 +163,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -309,8 +298,6 @@ Build-Date: ${build.tstamp}
+@@ -310,8 +298,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"/>
@@ -171,7 +172,7 @@ Forwarded: not-needed
<compilerarg line="-Xmaxwarns 1000"/>
</javac>
-@@ -324,6 +311,7 @@ Build-Date: ${build.tstamp}
+@@ -325,6 +311,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="${build.dir}"/>
<mkdir dir="${dist.dir}"/>
@@ -179,7 +180,7 @@ Forwarded: not-needed
</target>
<target name="javadoc" depends="init-properties">
<javadoc destdir="javadoc"
-@@ -349,6 +337,7 @@ Build-Date: ${build.tstamp}
+@@ -354,6 +341,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}"/>
@@ -187,7 +188,7 @@ Forwarded: not-needed
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
-@@ -779,6 +768,7 @@ Build-Date: ${build.tstamp}
+@@ -784,6 +772,7 @@ Build-Date: ${build.tstamp}
<pathelement path="${base.dir}"/>
<pathelement path="${proj-classpath}"/>
<pathelement path="${proj-build.dir}"/>
@@ -206,7 +207,7 @@ Forwarded: not-needed
<property name="josm.presets" value="${josm.build.dir}/data/defaultpresets.xml"/>
<property name="plugin.dir" value="../plugins"/>
<property name="maps.srcfile" value="http://josm.openstreetmap.de/maps"/>
-@@ -12,8 +12,8 @@
+@@ -13,8 +13,8 @@
<property name="i18n_data.install.dir" value="${josm.build.dir}/data_nodist/trans"/>
<property name="po.build.dir" value="${i18n.build.dir}"/>
<property name="ant.build.javac.target" value="1.5"/>
@@ -217,7 +218,7 @@ Forwarded: not-needed
<target name="init" description="Loads the Ant gettext and contrib tasks">
<taskdef name="gettext-extract" classname="org.xnap.commons.ant.gettext.GettextExtractKeysTask" classpath="${gettexttasks.jar}"/>
<!-- for the <foreach> possibility -->
-@@ -55,7 +55,7 @@
+@@ -59,7 +59,7 @@
</exec>
<delete file="po/josm.raw.pot"/>
</target>
@@ -226,7 +227,7 @@ Forwarded: not-needed
<gettext-extract keysFile="core.pot" poDirectory="po" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
<fileset dir="${josm.build.dir}/src" includes="**/*.java"/>
<fileset dir="${i18n.build.dir}" includes="specialmessages.java"/>
-@@ -96,9 +96,14 @@
+@@ -101,9 +101,14 @@
<delete file="${po.build.dir}/data.pot"/>
<delete file="${po.build.dir}/plugins.raw.pot"/>
</target>
@@ -244,7 +245,7 @@ Forwarded: not-needed
</target>
<target name="buildplugins" depends="init">
<foreach param="path" target="plugintrans" parallel="true" maxThreads="8">
-@@ -147,15 +152,14 @@
+@@ -152,15 +157,14 @@
</if>
<delete dir="${po.build.dir}/plugin_${dir}"/>
</target>
diff --git a/debian/patches/08-use_noto_font.patch b/debian/patches/08-use_noto_font.patch
index 9c4d649..14afbb8 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
-@@ -1561,7 +1561,7 @@ public class StyledMapRenderer extends A
+@@ -1558,7 +1558,7 @@ public class StyledMapRenderer extends A
showNames = paintSettings.getShowNamesDistance() > circum;
showIcons = paintSettings.getShowIconsDistance() > circum;
isOutlineOnly = paintSettings.isOutlineOnly();
--
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