[josm] 06/07: Refresh patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Dec 31 14:59:25 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit c4390dd483ceb0518da3d31118978721ec1502ef
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Dec 31 15:18:01 2015 +0100
Refresh patches.
---
debian/changelog | 1 +
debian/patches/00-build.patch | 26 +++++++++++++-------------
debian/patches/04-use_system_jmapviewer.patch | 2 +-
debian/patches/05-fix_version.patch | 2 +-
debian/patches/06-move_data_out_of_jar.patch | 4 ++--
debian/patches/08-use_noto_font.patch | 2 +-
6 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6450f75..92a8bf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ josm (0.0.svn9224+dfsg-1) UNRELEASED; urgency=medium
* New tested snapshot.
* Bump minimum required jmapviewer version to 1.14.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at debian.org> Thu, 31 Dec 2015 14:14:17 +0100
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 161576e..42626e3 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
-@@ -14,7 +14,8 @@
- <property name="build.dir" location="build"/>
+@@ -15,7 +15,8 @@
<property name="javacc.home" location="tools"/>
<property name="mapcss.dir" location="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss"/>
+ <property name="epsg.output" location="data/projection/custom-epsg"/>
- <property name="groovy.jar" location="tools/groovy-all-2.4.5.jar"/>
+ <property name="antcontrib.jar" value="/usr/share/java/ant-contrib.jar"/>
+ <property name="groovy.jar" location="/usr/share/java/groovy-all-2.x.jar"/>
<!-- build parameter: compression level (ant -Dclevel=N)
N ranges from 0 (no compression) to 9 (maximum compression)
default: 9 -->
-@@ -25,6 +26,19 @@
+@@ -26,6 +27,19 @@
<condition property="isJava9">
<equals arg1="${ant.java.version}" arg2="1.9" />
</condition>
@@ -39,7 +39,7 @@ Forwarded: not-needed
<!--
** Used by Eclipse ant builder for updating
-@@ -71,10 +85,9 @@
+@@ -72,10 +86,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>
-@@ -85,8 +98,10 @@
+@@ -86,8 +99,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>
<!--
-@@ -106,7 +121,8 @@ Build-Date: ${build.tstamp}
+@@ -107,7 +122,8 @@ Build-Date: ${build.tstamp}
<copy file="README" todir="build"/>
<copy file="LICENSE" todir="build"/>
<!-- create josm-custom.jar -->
@@ -74,7 +74,7 @@ Forwarded: not-needed
<jar destfile="dist/josm-custom.jar" basedir="build" level="${clevel}">
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
-@@ -116,6 +132,8 @@ Build-Date: ${build.tstamp}
+@@ -117,6 +133,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"/>
@@ -83,7 +83,7 @@ Forwarded: not-needed
</manifest>
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
-@@ -186,10 +204,7 @@ Build-Date: ${build.tstamp}
+@@ -187,10 +205,7 @@ Build-Date: ${build.tstamp}
</target>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
@@ -95,7 +95,7 @@ Forwarded: not-needed
<arg value="-DEBUG_PARSER=false"/>
<arg value="-DEBUG_TOKEN_MANAGER=false"/>
<arg value="-JDK_VERSION=1.7"/>
-@@ -200,31 +215,19 @@ Build-Date: ${build.tstamp}
+@@ -201,31 +216,19 @@ Build-Date: ${build.tstamp}
</target>
<target name="compile" depends="init,javacc">
<!-- COTS -->
@@ -131,7 +131,7 @@ Forwarded: not-needed
destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
-@@ -241,7 +244,7 @@ Build-Date: ${build.tstamp}
+@@ -242,7 +245,7 @@ Build-Date: ${build.tstamp}
<compilerarg value="-XDignore.symbol.file"/>
</javac>
<!-- JOSM -->
@@ -140,7 +140,7 @@ Forwarded: not-needed
destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
-@@ -268,6 +271,7 @@ Build-Date: ${build.tstamp}
+@@ -269,6 +272,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="build"/>
<mkdir dir="dist"/>
@@ -148,10 +148,10 @@ Forwarded: not-needed
</target>
<target name="javadoc">
<javadoc destdir="javadoc"
-@@ -290,6 +294,7 @@ Build-Date: ${build.tstamp}
- <delete dir="${mapcss.dir}/parsergen"/>
+@@ -293,6 +297,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}"/>
+ <ant target="clean" dir="i18n"/>
</target>
<path id="test.classpath">
diff --git a/debian/patches/04-use_system_jmapviewer.patch b/debian/patches/04-use_system_jmapviewer.patch
index e74df7e..f511d9d 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
-@@ -138,7 +138,6 @@ Debian-Release: ${debian.version}
+@@ -139,7 +139,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 5149fbd..802bff3 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
-@@ -127,7 +127,7 @@ Debian-Release: ${debian.version}
+@@ -128,7 +128,7 @@ Debian-Release: ${debian.version}
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
<attribute name="Main-class" value="JOSM"/>
diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch
index d7af6f4..5c47ce3 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -29,7 +29,7 @@ Forwarded: not-needed
/**
--- a/src/org/openstreetmap/josm/io/CachedFile.java
+++ b/src/org/openstreetmap/josm/io/CachedFile.java
-@@ -188,11 +188,17 @@ public class CachedFile {
+@@ -187,11 +187,17 @@ public class CachedFile {
File file = getFile();
if (file == null) {
if (name.startsWith("resource://")) {
@@ -54,7 +54,7 @@ Forwarded: not-needed
}
--- a/build.xml
+++ b/build.xml
-@@ -135,9 +135,9 @@ Debian-Release: ${debian.version}
+@@ -136,9 +136,9 @@ Debian-Release: ${debian.version}
<attribute name="Debian-Release" value="${debian.version}"/>
<attribute name="Class-Path" value="${classpathprop}"/>
</manifest>
diff --git a/debian/patches/08-use_noto_font.patch b/debian/patches/08-use_noto_font.patch
index 591f5b6..c69d358 100644
--- a/debian/patches/08-use_noto_font.patch
+++ b/debian/patches/08-use_noto_font.patch
@@ -5,7 +5,7 @@ Forwarded: https://josm.openstreetmap.de/ticket/12085
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
-@@ -1463,7 +1463,7 @@ public class StyledMapRenderer extends A
+@@ -1530,7 +1530,7 @@ public class StyledMapRenderer extends A
showNames = paintSettings.getShowNamesDistance() > circum;
showIcons = paintSettings.getShowIconsDistance() > circum;
isOutlineOnly = paintSettings.isOutlineOnly();
--
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