[josm] 05/06: Refresh patches.
Bas Couwenberg
sebastic at debian.org
Wed May 3 06:28:15 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 b02cdcc7ea78c30d53218f3d23af5f13f6419631
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed May 3 07:39:16 2017 +0200
Refresh patches.
---
debian/changelog | 1 +
debian/patches/00-build.patch | 19 ++++++++++---------
debian/patches/01-bts.patch | 4 ++--
debian/patches/05-fix_version.patch | 2 +-
debian/patches/06-move_data_out_of_jar.patch | 2 +-
5 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5132544..a241c68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ josm (0.0.svn12039+dfsg-1) UNRELEASED; urgency=medium
* Drop webkit-image-* packages from Recommends.
Yahoo imagery is no longer available (since 13 September 2011).
* Bump minimum required jmapviewer version to 2.1.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at debian.org> Wed, 03 May 2017 07:23:41 +0200
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 5596f7f..6c19ce2 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -13,7 +13,7 @@ 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.8.jar"/>
+- <property name="groovy.jar" location="${base.dir}/tools/groovy-all-2.4.11.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.19.jar"/>
@@ -82,7 +82,7 @@ Forwarded: not-needed
</manifest>
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
-@@ -212,38 +229,21 @@ Build-Date: ${build.tstamp}
+@@ -212,39 +229,21 @@ Build-Date: ${build.tstamp}
</target>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
@@ -106,6 +106,7 @@ Forwarded: not-needed
<!-- get rid of "internal proprietary API" warning -->
<compilerarg value="-XDignore.symbol.file"/>
- <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"/>
@@ -124,7 +125,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"/>
-@@ -264,19 +264,13 @@ Build-Date: ${build.tstamp}
+@@ -265,19 +264,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/**"/>
@@ -139,7 +140,7 @@ Forwarded: not-needed
<!-- JMapViewer -->
- <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
+ <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath"
- excludes="com/**,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/**,JOSM.java,gnu/**"
+ excludes="com/**,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/**"
destdir="build" target="1.8" source="1.8" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
- <compilerclasspath>
- <pathelement location="${error_prone_ant.jar}"/>
@@ -147,7 +148,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -290,16 +284,12 @@ Build-Date: ${build.tstamp}
+@@ -291,16 +284,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"/>
@@ -165,7 +166,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -313,11 +303,6 @@ Build-Date: ${build.tstamp}
+@@ -314,11 +303,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"/>
@@ -177,7 +178,7 @@ Forwarded: not-needed
<compilerarg line="-Xmaxwarns 1000"/>
</javac>
-@@ -331,6 +316,7 @@ Build-Date: ${build.tstamp}
+@@ -332,6 +316,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="${build.dir}"/>
<mkdir dir="${dist.dir}"/>
@@ -185,7 +186,7 @@ Forwarded: not-needed
</target>
<target name="javadoc" depends="init-properties">
<javadoc destdir="javadoc"
-@@ -360,6 +346,7 @@ Build-Date: ${build.tstamp}
+@@ -361,6 +346,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}"/>
@@ -193,7 +194,7 @@ Forwarded: not-needed
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
-@@ -808,6 +795,7 @@ Build-Date: ${build.tstamp}
+@@ -811,6 +797,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 9d34e74..352e7cd 100644
--- a/debian/patches/01-bts.patch
+++ b/debian/patches/01-bts.patch
@@ -36,7 +36,7 @@ Forwarded: not-needed
about.addTab(tr("Readme"), createScrollPane(readme));
--- a/src/org/openstreetmap/josm/data/Version.java
+++ b/src/org/openstreetmap/josm/data/Version.java
-@@ -37,6 +37,7 @@ public class Version {
+@@ -38,6 +38,7 @@ public class Version {
private int version;
private String releaseDescription;
@@ -53,7 +53,7 @@ Forwarded: not-needed
// the last changed data
//
time = properties.getProperty("Last Changed Date");
-@@ -132,6 +135,10 @@ public class Version {
+@@ -125,6 +128,10 @@ public class Version {
return version == 0 ? tr("UNKNOWN") : Integer.toString(version);
}
diff --git a/debian/patches/05-fix_version.patch b/debian/patches/05-fix_version.patch
index 204b208..ae2009d 100644
--- a/debian/patches/05-fix_version.patch
+++ b/debian/patches/05-fix_version.patch
@@ -11,7 +11,7 @@ Forwarded: not-needed
@@ -152,7 +152,7 @@ Debian-Release: ${debian.version}
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
- <attribute name="Main-class" value="JOSM"/>
+ <attribute name="Main-class" value="org.openstreetmap.josm.gui.MainApplication"/>
- <attribute name="Main-Version" value="${version.entry.commit.revision} SVN"/>
+ <attribute name="Main-Version" value="${version.entry.commit.revision}"/>
<attribute name="Main-Date" value="${version.entry.commit.date}"/>
diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch
index 286945e..e49de37 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -44,7 +44,7 @@ Forwarded: not-needed
/**
--- a/src/org/openstreetmap/josm/io/CachedFile.java
+++ b/src/org/openstreetmap/josm/io/CachedFile.java
-@@ -207,11 +207,17 @@ public class CachedFile implements Close
+@@ -206,11 +206,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
More information about the Pkg-grass-devel
mailing list