[josm] 04/05: Refresh patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Jan 7 20:44:12 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit 7dc8a2911cf92478be614697f481b08ac3684bdf
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Jan 7 21:25:31 2016 +0100
Refresh patches.
---
debian/changelog | 1 +
debian/patches/00-build.patch | 28 ++++++++++++----------------
debian/patches/02-elemstyles.patch | 2 +-
debian/patches/06-move_data_out_of_jar.patch | 2 +-
debian/patches/08-use_noto_font.patch | 8 ++++----
5 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3a82f2b..b21ec6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
josm (0.0.svn9329+dfsg-1) UNRELEASED; urgency=medium
* New tested snapshot.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at debian.org> Thu, 07 Jan 2016 00:24:05 +0100
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index ff881b3..f95e786 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -148,7 +148,7 @@ Forwarded: not-needed
</target>
<target name="javadoc">
<javadoc destdir="javadoc"
-@@ -293,6 +297,7 @@ Build-Date: ${build.tstamp}
+@@ -294,6 +298,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}"/>
@@ -156,7 +156,7 @@ Forwarded: not-needed
</target>
<path id="test.classpath">
<fileset dir="${test.dir}/lib">
-@@ -658,6 +663,7 @@ Build-Date: ${build.tstamp}
+@@ -659,6 +664,7 @@ Build-Date: ${build.tstamp}
<pathelement path="."/>
<pathelement path="build"/>
<pathelement path="build2"/>
@@ -186,38 +186,34 @@ 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 -->
-@@ -51,7 +51,7 @@
- <fileset dir="${plugin.dir}" includes="**/*.java"/>
- </gettext-extract>
+@@ -55,7 +55,7 @@
+ </exec>
+ <delete file="po/josm.raw.pot"/>
</target>
- <target name="po/core.pot" description="Extracts message keys from the JOSM core source code" depends="trans_.java,init">
+ <target name="po/core.pot" description="Extracts message keys from the JOSM core source code" depends="builddir,init">
<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"/>
-@@ -92,14 +92,14 @@
+@@ -96,9 +96,14 @@
<delete file="${po.build.dir}/data.pot"/>
<delete file="${po.build.dir}/plugins.raw.pot"/>
</target>
- <target name="build" depends="pot,allpot">
+- <antcall target="buildcore"/>
+- <antcall target="buildplugins"/>
+ <target name="build.check">
+ <condition property="build.run">
+ <not><available file="build-timestamp"/></not>
+ </condition>
+ </target>
+ <target name="build" depends="build.check,po/core.pot" if="build.run">
- <antcall target="coretrans"/>
-- <antcall target="datatrans"/>
-- <foreach param="path" target="plugintrans">
-- <path>
-- <dirset dir="${plugin.dir}" includes="*" excludes="00_*" />
-- </path>
-- </foreach>
++ <antcall target="coretrans"/>
+ <touch file="build-timestamp"/>
</target>
- <target name="singleplugintrans" depends="init">
- <antcall target="plugintrans">
-@@ -141,15 +141,14 @@
+ <target name="buildplugins" depends="init">
+ <foreach param="path" target="plugintrans">
+@@ -147,15 +152,14 @@
</if>
<delete dir="${po.build.dir}/plugin_${dir}"/>
</target>
diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch
index a392e71..b60585d 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
--- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-@@ -231,14 +231,19 @@ public final class MapPaintStyles {
+@@ -234,14 +234,19 @@ public final class MapPaintStyles {
}
if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) {
diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch
index 5c47ce3..ee89b2f 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
-@@ -187,11 +187,17 @@ public class CachedFile {
+@@ -186,11 +186,17 @@ public class CachedFile {
File file = getFile();
if (file == null) {
if (name.startsWith("resource://")) {
diff --git a/debian/patches/08-use_noto_font.patch b/debian/patches/08-use_noto_font.patch
index c69d358..4d810f1 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
-@@ -1530,7 +1530,7 @@ public class StyledMapRenderer extends A
+@@ -1532,7 +1532,7 @@ public class StyledMapRenderer extends A
showNames = paintSettings.getShowNamesDistance() > circum;
showIcons = paintSettings.getShowIconsDistance() > circum;
isOutlineOnly = paintSettings.isOutlineOnly();
@@ -14,9 +14,9 @@ Forwarded: https://josm.openstreetmap.de/ticket/12085
antialiasing = Main.pref.getBoolean("mappaint.use-antialiasing", true) ?
RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF;
---- a/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java
-+++ b/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java
-@@ -120,7 +120,7 @@ public abstract class ElemStyle implemen
+--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
++++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
+@@ -123,7 +123,7 @@ public abstract class StyleElement imple
synchronized (lock) {
n = DEFAULT_FONT_NAME;
if (n == null) {
--
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