This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit 801ccc478bc814fdd6f43ff34c8b77165802b8f0
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sun Dec 31 20:37:22 2017 +0100
Refresh patches.
---
debian/changelog | 1 +
debian/patches/00-build.patch | 34 +++++++++++++--------------
debian/patches/04-use_system_jmapviewer.patch | 2 +-
debian/patches/05-fix_version.patch | 2 +-
debian/patches/06-move_data_out_of_jar.patch | 12 +++++-----
5 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fca68e4..f695ee9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ josm (0.0.svn13265+dfsg-1) UNRELEASED; urgency=medium
* New tested snapshot.
* Update copyright years for JSON sources.
+ * Refresh patches.
-- Bas Couwenberg <sebas...@debian.org> Sun, 31 Dec 2017 20:21:38 +0100
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index cd55231..da1e240 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -9,17 +9,17 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -25,7 +25,8 @@
+@@ -29,7 +29,8 @@
<property name="proj-build.dir" location="${base.dir}/build2"/>
<property name="checkstyle-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.jar"/>
+- <property name="groovy.jar" location="${tools.dir}/groovy-all.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.jar"/>
+ <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"/>
-@@ -44,6 +45,19 @@
+@@ -48,6 +49,19 @@
<condition property="isJava9">
<matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" />
</condition>
@@ -39,7 +39,7 @@ Forwarded: not-needed
<path id="test.classpath">
<fileset dir="${test.dir}/lib">
<include name="**/*.jar"/>
-@@ -106,10 +120,9 @@
+@@ -110,10 +124,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>
-@@ -120,8 +133,10 @@
+@@ -124,8 +137,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>
<!--
-@@ -141,7 +156,7 @@ Build-Date: ${build.tstamp}
+@@ -145,7 +160,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>
-@@ -151,6 +166,8 @@ Build-Date: ${build.tstamp}
+@@ -155,6 +170,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" />
-@@ -225,43 +242,21 @@ Build-Date: ${build.tstamp}
+@@ -229,43 +246,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"/>
-@@ -282,21 +277,15 @@ Build-Date: ${build.tstamp}
+@@ -286,21 +281,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"/>
-@@ -310,18 +299,14 @@ Build-Date: ${build.tstamp}
+@@ -314,18 +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"/>
@@ -166,7 +166,7 @@ Forwarded: not-needed
<!-- JOSM -->
- <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/**,gnu/**"
+
excludes="com/**,javax/**,gnu/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**"
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 +174,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -335,12 +320,6 @@ Build-Date: ${build.tstamp}
+@@ -339,12 +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"/>
@@ -187,7 +187,7 @@ Forwarded: not-needed
<compilerarg line="-Xmaxwarns 1000"/>
<exclude
name="org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java"
if:set="noJavaFX"/>
</javac>
-@@ -355,6 +334,7 @@ Build-Date: ${build.tstamp}
+@@ -359,6 +338,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="${build.dir}"/>
<mkdir dir="${dist.dir}"/>
@@ -195,15 +195,15 @@ Forwarded: not-needed
</target>
<target name="javadoc" depends="init-properties">
<javadoc destdir="javadoc"
-@@ -387,6 +367,7 @@ Build-Date: ${build.tstamp}
- <delete file="${src.dir}/org/w3/_2001/xmlschema/Adapter1.java"/>
+@@ -392,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"/>
+ <ant target="clean" dir="i18n"/>
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
-@@ -888,6 +869,7 @@ Build-Date: ${build.tstamp}
+@@ -893,6 +874,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 925d989..d6bfafe 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
-@@ -176,7 +176,6 @@ Debian-Release: ${debian.version}
+@@ -180,7 +180,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 6c4ac07..09f3cdf 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
-@@ -161,7 +161,7 @@ Debian-Release: ${debian.version}
+@@ -165,7 +165,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 8deb67e..3bc27f0 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
-@@ -173,9 +173,6 @@ Debian-Release: ${debian.version}
+@@ -177,9 +177,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" />
@@ -18,15 +18,15 @@ Forwarded: not-needed
<!-- Mac OS X target -->
--- a/src/org/openstreetmap/josm/tools/I18n.java
+++ b/src/org/openstreetmap/josm/tools/I18n.java
-@@ -9,6 +9,7 @@ import java.io.InputStream;
+@@ -8,6 +8,7 @@ import java.io.InputStream;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.net.URL;
+import java.net.MalformedURLException;
import java.nio.charset.StandardCharsets;
- import java.text.MessageFormat;
- import java.util.ArrayList;
-@@ -312,7 +313,11 @@ public final class I18n {
+ import java.nio.file.Files;
+ import java.nio.file.InvalidPathException;
+@@ -313,7 +314,11 @@ public final class I18n {
}
private static URL getTranslationFile(String lang) {
@@ -41,7 +41,7 @@ Forwarded: not-needed
/**
--- a/src/org/openstreetmap/josm/io/CachedFile.java
+++ b/src/org/openstreetmap/josm/io/CachedFile.java
-@@ -208,11 +208,17 @@ public class CachedFile implements Close
+@@ -207,11 +207,17 @@ public class CachedFile implements Close
File file = getFile();
if (file == null) {
if (name != null && name.startsWith("resource://")) {
--
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
