This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit 9fb4e31c34bd91c38617e84b301c1f6f9f65cf14
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Mon Jan 29 07:54:27 2018 +0100
Refresh patches.
---
debian/changelog | 1 +
debian/patches/00-build.patch | 30 ++++++++++++++++--------------
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9c3fd37..5c6662c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ josm (0.0.svn13367+dfsg-1) UNRELEASED; urgency=medium
* Bump Standards-Version to 4.1.3, no changes.
* Update copyright-format URL to use HTTPS.
* Add license & copyright for XZ Java sources.
+ * Refresh patches.
-- Bas Couwenberg <sebas...@debian.org> Mon, 29 Jan 2018 07:41:41 +0100
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index da1e240..2aec9e8 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -100,8 +100,8 @@ Forwarded: not-needed
</target>
<target name="compile-cots" depends="init">
<!-- COTS -->
-- <javac srcdir="${src.dir}"
includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,gnu/**"
nowarn="on" encoding="iso-8859-1"
-+ <javac srcdir="${src.dir}" classpathref="classpath"
includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,gnu/**"
nowarn="on" encoding="iso-8859-1"
+- <javac srcdir="${src.dir}"
includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/tukaani/**,gnu/**"
nowarn="on" encoding="iso-8859-1"
++ <javac srcdir="${src.dir}" classpathref="classpath"
includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/tukaani/**,gnu/**"
nowarn="on" encoding="iso-8859-1"
destdir="${build.dir}" target="${java.lang.version}"
source="${java.lang.version}" debug="on" includeAntRuntime="false"
createMissingPackageInfoClass="false">
<!-- get rid of "internal proprietary API" warning -->
<compilerarg value="-XDignore.symbol.file"/>
@@ -110,8 +110,6 @@ Forwarded: not-needed
- <exclude name="org/apache/commons/compress/changes/**"/>
- <exclude
name="org/apache/commons/compress/compressors/bzip2/BZip2Utils.java"/>
- <exclude
name="org/apache/commons/compress/compressors/brotli/**"/>
-- <exclude name="org/apache/commons/compress/compressors/lzma/**"/>
-- <exclude name="org/apache/commons/compress/compressors/xz/**"/>
- <exclude
name="org/apache/commons/compress/compressors/CompressorStreamFactory.java"/>
- <exclude
name="org/apache/commons/compress/compressors/CompressorStreamProvider.java"/>
- <exclude
name="org/apache/commons/compress/compressors/CompressorException.java"/>
@@ -119,9 +117,11 @@ Forwarded: not-needed
- <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/lzma/**"/>
- <exclude
name="org/apache/commons/compress/compressors/lz77support/**"/>
- <exclude
name="org/apache/commons/compress/compressors/pack200/**"/>
- <exclude
name="org/apache/commons/compress/compressors/snappy/**"/>
+- <exclude
name="org/apache/commons/compress/compressors/xz/XZUtils.java"/>
- <exclude name="org/apache/commons/compress/compressors/z/**"/>
- <exclude
name="org/apache/commons/compress/compressors/zstandard/**"/>
- <exclude name="org/apache/commons/compress/parallel/**"/>
@@ -146,7 +146,7 @@ Forwarded: not-needed
<!-- JMapViewer -->
- <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
+ <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath"
-
excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,gnu/**"
+
excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,org/tukaani/**,gnu/**"
destdir="${build.dir}" target="${java.lang.version}"
source="${java.lang.version}" debug="on" includeantruntime="false"
createMissingPackageInfoClass="false" encoding="UTF-8">
- <compilerclasspath>
- <pathelement location="${error_prone_ant.jar}"/>
@@ -154,11 +154,12 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -314,18 +303,14 @@ Build-Date: ${build.tstamp}
+@@ -314,19 +303,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"/>
- <compilerarg value="-Xep:ReferenceEquality:OFF"
compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+- <compilerarg value="-Xep:StringSplitter:OFF"
compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
<compilerarg line="-Xmaxwarns 1000"/>
</javac>
</target>
@@ -166,7 +167,7 @@ Forwarded: not-needed
<!-- JOSM -->
- <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
+ <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath"
-
excludes="com/**,javax/**,gnu/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**"
+
excludes="com/**,javax/**,gnu/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,org/tukaani/**"
destdir="${build.dir}" target="${java.lang.version}"
source="${java.lang.version}" debug="on" includeantruntime="false"
createMissingPackageInfoClass="false" encoding="UTF-8">
- <compilerclasspath>
- <pathelement location="${error_prone_ant.jar}"/>
@@ -174,7 +175,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -339,12 +324,6 @@ Build-Date: ${build.tstamp}
+@@ -340,13 +324,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"/>
@@ -183,11 +184,12 @@ Forwarded: not-needed
- <compilerarg value="-Xep:FutureReturnValueIgnored:OFF"
compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
- <compilerarg value="-Xep:FloatingPointLiteralPrecision:OFF"
compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
- <compilerarg value="-Xep:ShortCircuitBoolean:OFF"
compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+- <compilerarg value="-Xep:StringSplitter:OFF"
compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
- <compilerarg value="-Xep:JdkObsolete:OFF"
compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
<compilerarg line="-Xmaxwarns 1000"/>
<exclude
name="org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java"
if:set="noJavaFX"/>
</javac>
-@@ -359,6 +338,7 @@ Build-Date: ${build.tstamp}
+@@ -361,6 +338,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="${build.dir}"/>
<mkdir dir="${dist.dir}"/>
@@ -195,7 +197,7 @@ Forwarded: not-needed
</target>
<target name="javadoc" depends="init-properties">
<javadoc destdir="javadoc"
-@@ -392,6 +372,7 @@ Build-Date: ${build.tstamp}
+@@ -394,6 +372,7 @@ Build-Date: ${build.tstamp}
<delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
<delete file="${epsg.output}"/>
<delete file="${pmd.dir}/cache"/>
@@ -203,7 +205,7 @@ Forwarded: not-needed
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
-@@ -893,6 +874,7 @@ Build-Date: ${build.tstamp}
+@@ -905,6 +884,7 @@ Build-Date: ${build.tstamp}
<pathelement path="${base.dir}"/>
<pathelement path="${proj-classpath}"/>
<pathelement path="${proj-build.dir}"/>
@@ -233,7 +235,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 -->
-@@ -66,7 +66,7 @@
+@@ -87,7 +87,7 @@
</exec>
<delete file="po/josm.raw.pot"/>
</target>
@@ -242,7 +244,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"/>
-@@ -108,9 +108,14 @@
+@@ -129,9 +129,14 @@
<delete file="${po.build.dir}/data.pot"/>
<delete file="${po.build.dir}/plugins.raw.pot"/>
</target>
@@ -260,7 +262,7 @@ Forwarded: not-needed
</target>
<target name="buildplugins" depends="init">
<foreach param="path" target="plugintrans" parallel="true"
maxThreads="8">
-@@ -159,15 +164,14 @@
+@@ -184,15 +189,14 @@
</if>
<delete dir="${po.build.dir}/plugin_${dir}"/>
</target>
--
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
