This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm.
commit b01d3f479432a7e1cbb860d2b6886a078a15d206 Author: Bas Couwenberg <[email protected]> Date: Tue Jan 31 08:02:40 2017 +0100 Refresh patches. --- debian/changelog | 1 + debian/patches/00-build.patch | 24 ++++++++++++++---------- debian/patches/01-bts.patch | 2 +- debian/patches/06-move_data_out_of_jar.patch | 2 +- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8ee5da7..5d0cfb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ josm (0.0.svn11514+dfsg-1) UNRELEASED; urgency=medium * New tested snapshot. * Add license & copyright for OSM test data. + * Refresh patches. -- Bas Couwenberg <[email protected]> Tue, 31 Jan 2017 07:40:01 +0100 diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch index 36ed654..6d5dae9 100644 --- a/debian/patches/00-build.patch +++ b/debian/patches/00-build.patch @@ -13,10 +13,10 @@ Forwarded: not-needed <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.7.jar"/> +- <property name="groovy.jar" location="${base.dir}/tools/groovy-all-2.4.8.jar"/> + <property name="groovy.jar" location="/usr/share/java/groovy-all.jar"/> + <property name="antcontrib.jar" value="/usr/share/java/ant-contrib.jar"/> - <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.14.jar"/> + <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.15.jar"/> <property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" /> <!-- build parameter: compression level (ant -Dclevel=N) @@ -37,6 +38,19 @@ @@ -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,22 +235,10 @@ Build-Date: ${build.tstamp} +@@ -221,25 +235,10 @@ Build-Date: ${build.tstamp} </target> <target name="compile" depends="init,javacc"> <!-- COTS --> @@ -112,13 +112,16 @@ Forwarded: not-needed - <exclude name="org/apache/commons/compress/compressors/FileNameUtil.java"/> - <exclude name="org/apache/commons/compress/compressors/deflate/**"/> - <exclude name="org/apache/commons/compress/compressors/gzip/**"/> +- <exclude name="org/apache/commons/compress/compressors/lz4/**"/> +- <exclude name="org/apache/commons/compress/compressors/lz77support/**"/> - <exclude name="org/apache/commons/compress/compressors/lzw/**"/> - <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/compressors/z/**"/> <exclude name="org/apache/commons/jcs/JCS.java"/> <exclude name="org/apache/commons/jcs/access/GroupCacheAccess.java"/> -@@ -258,19 +260,13 @@ Build-Date: ${build.tstamp} + <exclude name="org/apache/commons/jcs/access/PartitionedCacheAccess.java"/> +@@ -260,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/**"/> @@ -141,7 +144,7 @@ Forwarded: not-needed <compilerarg value="-Xlint:cast"/> <compilerarg value="-Xlint:deprecation"/> <compilerarg value="-Xlint:dep-ann"/> -@@ -284,16 +280,12 @@ Build-Date: ${build.tstamp} +@@ -286,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"/> @@ -159,15 +162,16 @@ Forwarded: not-needed <compilerarg value="-Xlint:cast"/> <compilerarg value="-Xlint:deprecation"/> <compilerarg value="-Xlint:dep-ann"/> -@@ -307,7 +299,6 @@ Build-Date: ${build.tstamp} +@@ -309,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"/> - <compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/> +- <compilerarg value="-Xep:ImmutableEnumChecker:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/> <compilerarg line="-Xmaxwarns 1000"/> </javac> -@@ -321,6 +312,7 @@ Build-Date: ${build.tstamp} +@@ -324,6 +311,7 @@ Build-Date: ${build.tstamp} </uptodate> <mkdir dir="${build.dir}"/> <mkdir dir="${dist.dir}"/> @@ -175,7 +179,7 @@ Forwarded: not-needed </target> <target name="javadoc" depends="init-properties"> <javadoc destdir="javadoc" -@@ -346,6 +338,7 @@ Build-Date: ${build.tstamp} +@@ -349,6 +337,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}"/> @@ -183,7 +187,7 @@ Forwarded: not-needed </target> <macrodef name="init-test-preferences"> <attribute name="testfamily"/> -@@ -776,6 +769,7 @@ Build-Date: ${build.tstamp} +@@ -779,6 +768,7 @@ Build-Date: ${build.tstamp} <pathelement path="${base.dir}"/> <pathelement path="${proj-classpath}"/> <pathelement path="${proj-build.dir}"/> diff --git a/debian/patches/01-bts.patch b/debian/patches/01-bts.patch index affbbb2..c27bb55 100644 --- a/debian/patches/01-bts.patch +++ b/debian/patches/01-bts.patch @@ -74,7 +74,7 @@ Forwarded: not-needed import org.openstreetmap.josm.tools.PlatformHookUnixoid; import org.openstreetmap.josm.tools.Shortcut; import org.openstreetmap.josm.tools.Utils; -@@ -294,7 +295,7 @@ public final class ShowStatusReportActio +@@ -297,7 +298,7 @@ public final class ShowStatusReportActio switch (ed.showDialog().getValue()) { case 1: ta.copyToClipboard(); break; diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch index f76d98b..9034df5 100644 --- a/debian/patches/06-move_data_out_of_jar.patch +++ b/debian/patches/06-move_data_out_of_jar.patch @@ -47,7 +47,7 @@ Forwarded: not-needed @@ -207,11 +207,17 @@ public class CachedFile implements Close File file = getFile(); if (file == null) { - if (name.startsWith("resource://")) { + if (name != null && name.startsWith("resource://")) { - InputStream is = getClass().getResourceAsStream( - name.substring("resource:/".length())); - if (is == null) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
