This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit fd04442f5772ffa3763c28c789554914b4af0daf
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sun Mar 4 19:02:34 2018 +0100
Refresh patches.
---
debian/changelog | 1 +
debian/patches/00-build.patch | 28 +++++++++++++--------------
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 +-
5 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8bf891c..48edbd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
josm (0.0.svn13500+dfsg-1) UNRELEASED; urgency=medium
* New hotfix tested snapshot.
+ * Refresh patches.
-- Bas Couwenberg <sebas...@debian.org> Sun, 04 Mar 2018 19:00:38 +0100
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 2aec9e8..da04514 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -19,9 +19,9 @@ Forwarded: not-needed
<property name="error_prone_ant.jar"
location="${tools.dir}/error_prone_ant.jar"/>
<property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
<property name="dist-optimized.jar"
location="${dist.dir}/josm-custom-optimized.jar"/>
-@@ -48,6 +49,19 @@
- <condition property="isJava9">
- <matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" />
+@@ -55,6 +56,19 @@
+ <condition property="javac.compiler" value="modern"
else="com.google.errorprone.ErrorProneAntCompilerAdapter">
+ <isset property="isJava10"/>
</condition>
+ <!-- Java classpath addition (all jar files to compile tests with
this) -->
+ <path id="classpath">
@@ -39,7 +39,7 @@ Forwarded: not-needed
<path id="test.classpath">
<fileset dir="${test.dir}/lib">
<include name="**/*.jar"/>
-@@ -110,10 +124,9 @@
+@@ -117,10 +131,9 @@
<!--
** Creates the REVISION file to be included in the distribution
-->
@@ -52,7 +52,7 @@ Forwarded: not-needed
<tstamp>
<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
-@@ -124,8 +137,10 @@
+@@ -131,8 +144,10 @@
<echo file="${revision.dir}/REVISION">
# automatically generated by JOSM build.xml - do not edit
Revision: ${version.entry.commit.revision}
@@ -64,7 +64,7 @@ Forwarded: not-needed
</echo>
</target>
<!--
-@@ -145,7 +160,7 @@ Build-Date: ${build.tstamp}
+@@ -152,7 +167,7 @@ Build-Date: ${build.tstamp}
<copy file="README" todir="${build.dir}"/>
<copy file="LICENSE" todir="${build.dir}"/>
<!-- create josm-custom.jar -->
@@ -73,7 +73,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>
-@@ -155,6 +170,8 @@ Build-Date: ${build.tstamp}
+@@ -162,6 +177,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"/>
@@ -82,7 +82,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" />
-@@ -229,43 +246,21 @@ Build-Date: ${build.tstamp}
+@@ -236,43 +253,21 @@ Build-Date: ${build.tstamp}
</target>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
@@ -129,7 +129,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"/>
-@@ -286,21 +281,15 @@ Build-Date: ${build.tstamp}
+@@ -293,21 +288,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/**"/>
@@ -154,7 +154,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -314,19 +303,14 @@ Build-Date: ${build.tstamp}
+@@ -321,19 +310,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"/>
@@ -175,7 +175,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -340,13 +324,6 @@ Build-Date: ${build.tstamp}
+@@ -347,13 +331,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"/>
@@ -189,7 +189,7 @@ Forwarded: not-needed
<compilerarg line="-Xmaxwarns 1000"/>
<exclude
name="org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java"
if:set="noJavaFX"/>
</javac>
-@@ -361,6 +338,7 @@ Build-Date: ${build.tstamp}
+@@ -368,6 +345,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="${build.dir}"/>
<mkdir dir="${dist.dir}"/>
@@ -197,7 +197,7 @@ Forwarded: not-needed
</target>
<target name="javadoc" depends="init-properties">
<javadoc destdir="javadoc"
-@@ -394,6 +372,7 @@ Build-Date: ${build.tstamp}
+@@ -402,6 +380,7 @@ Build-Date: ${build.tstamp}
<delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
<delete file="${epsg.output}"/>
<delete file="${pmd.dir}/cache"/>
@@ -205,7 +205,7 @@ Forwarded: not-needed
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
-@@ -905,6 +884,7 @@ Build-Date: ${build.tstamp}
+@@ -913,6 +892,7 @@ Build-Date: ${build.tstamp}
<pathelement path="${base.dir}"/>
<pathelement path="${proj-classpath}"/>
<pathelement path="${proj-build.dir}"/>
diff --git a/debian/patches/04-use_system_jmapviewer.patch
b/debian/patches/04-use_system_jmapviewer.patch
index d6bfafe..570cac1 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
-@@ -180,7 +180,6 @@ Debian-Release: ${debian.version}
+@@ -187,7 +187,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 09f3cdf..4522a0d 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
-@@ -165,7 +165,7 @@ Debian-Release: ${debian.version}
+@@ -172,7 +172,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"/>
diff --git a/debian/patches/06-move_data_out_of_jar.patch
b/debian/patches/06-move_data_out_of_jar.patch
index 3bc27f0..febd4e0 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -177,9 +177,6 @@ Debian-Release: ${debian.version}
+@@ -184,9 +184,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" />
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/josm.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
