[josm] 05/09: Drop 09-josm-default-options.patch, applied upstream. Refresh remaining patches.
Bas Couwenberg
sebastic at debian.org
Tue Jul 12 12:25:47 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 f34a1778002e31d8a8a6d5525e7e8f0500fce7e9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Jul 12 13:23:09 2016 +0200
Drop 09-josm-default-options.patch, applied upstream. Refresh remaining patches.
---
debian/changelog | 2 +
debian/patches/00-build.patch | 4 +-
debian/patches/01-bts.patch | 12 +++---
debian/patches/02-elemstyles.patch | 6 +--
debian/patches/08-use_noto_font.patch | 2 +-
debian/patches/09-josm-default-options.patch | 57 ----------------------------
debian/patches/series | 1 -
7 files changed, 14 insertions(+), 70 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e966af8..faa168e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ josm (0.0.svn10526+dfsg-1) UNRELEASED; urgency=medium
* Use /etc/default/josm to configure Java options.
(LP: #287717)
* Require at least openstreetmap-map-icons-classic 1:0.0.svn32641.
+ * Drop 09-josm-default-options.patch, applied upstream.
+ Refresh remaining patches.
-- Bas Couwenberg <sebastic at debian.org> Tue, 12 Jul 2016 12:12:28 +0200
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 9a0c6c6..f0d9daf 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.6.jar"/>
+- <property name="groovy.jar" location="${base.dir}/tools/groovy-all-2.4.7.jar"/>
+ <property name="antcontrib.jar" value="/usr/share/java/ant-contrib.jar"/>
+ <property name="groovy.jar" location="/usr/share/java/groovy-all.jar"/>
<!-- build parameter: compression level (ant -Dclevel=N)
@@ -155,7 +155,7 @@ Forwarded: not-needed
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
-@@ -715,6 +719,7 @@ Build-Date: ${build.tstamp}
+@@ -716,6 +720,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 0c5bc2e..a7f7dc9 100644
--- a/debian/patches/01-bts.patch
+++ b/debian/patches/01-bts.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
--- a/src/org/openstreetmap/josm/actions/AboutAction.java
+++ b/src/org/openstreetmap/josm/actions/AboutAction.java
-@@ -14,6 +14,9 @@ import java.io.IOException;
+@@ -13,6 +13,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -15,9 +15,9 @@ Forwarded: not-needed
+import java.util.regex.Pattern;
+
import javax.swing.BorderFactory;
- import javax.swing.ImageIcon;
import javax.swing.JLabel;
-@@ -84,6 +87,8 @@ public final class AboutAction extends J
+ import javax.swing.JPanel;
+@@ -82,6 +85,8 @@ public final class AboutAction extends J
"<p style='font-size:75%'></p>" +
"<p>" + tr("Version {0}", version.getVersionString()) + "</p>" +
"<p style='font-size:50%'></p>" +
@@ -26,7 +26,7 @@ Forwarded: not-needed
"<p>" + tr("Last change at {0}", version.getTime()) + "</p>" +
"<p style='font-size:50%'></p>" +
"<p>" + tr("Java Version {0}", System.getProperty("java.version")) + "</p>" +
-@@ -93,6 +98,7 @@ public final class AboutAction extends J
+@@ -91,6 +96,7 @@ public final class AboutAction extends J
info.add(new JLabel(tr("Homepage")), GBC.std().insets(10, 0, 10, 0));
info.add(new UrlLabel(Main.getJOSMWebsite(), 2), GBC.eol().fill(GBC.HORIZONTAL));
info.add(GBC.glue(0, 5), GBC.eol());
@@ -54,7 +54,7 @@ Forwarded: not-needed
//
time = properties.getProperty("Last Changed Date");
@@ -132,6 +135,10 @@ public class Version {
- return version == 0 ? tr("UNKNOWN") : Integer.toString(version);
+ return version == 0 ? tr("UNKNOWN") : Integer.toString(version);
}
+ public String getDebianVersionString() {
@@ -116,7 +116,7 @@ Forwarded: not-needed
import org.openstreetmap.josm.tools.PlatformHookUnixoid;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.bugreport.BugReportSender;
-@@ -270,7 +271,7 @@ public final class ShowStatusReportActio
+@@ -268,7 +269,7 @@ public final class ShowStatusReportActio
switch (ed.showDialog().getValue()) {
case 1: ta.copyToClippboard(); break;
diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch
index c6845fc..f6058fa 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -32,10 +32,10 @@ Forwarded: not-needed
--- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
-@@ -46,6 +46,7 @@ import org.openstreetmap.josm.gui.MapVie
- import org.openstreetmap.josm.gui.Notification;
+@@ -46,6 +46,7 @@ import org.openstreetmap.josm.gui.Notifi
import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
- import org.openstreetmap.josm.gui.layer.Layer;
+ import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
+ import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
import org.openstreetmap.josm.gui.tagging.presets.items.Key;
diff --git a/debian/patches/08-use_noto_font.patch b/debian/patches/08-use_noto_font.patch
index 7b1399e..21cbd1c 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
-@@ -1564,7 +1564,7 @@ public class StyledMapRenderer extends A
+@@ -1566,7 +1566,7 @@ public class StyledMapRenderer extends A
showNames = paintSettings.getShowNamesDistance() > circum;
showIcons = paintSettings.getShowIconsDistance() > circum;
isOutlineOnly = paintSettings.isOutlineOnly();
diff --git a/debian/patches/09-josm-default-options.patch b/debian/patches/09-josm-default-options.patch
deleted file mode 100644
index effa8ed..0000000
--- a/debian/patches/09-josm-default-options.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Description: Use /etc/default/josm to configure Java options.
-Author: Stéphane Brunner (https://launchpad.net/~stephane-brunner)
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/josm/+bug/287717
-Forwarded: https://josm.openstreetmap.de/ticket/13002
-Applied-Upstream: https://josm.openstreetmap.de/changeset/10430/josm
-
---- a/linux/latest/usr/bin/josm-latest
-+++ b/linux/latest/usr/bin/josm-latest
-@@ -20,6 +20,10 @@ else
- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java"
- fi
-
-+if [ -f /etc/default/josm-latest ]; then
-+ . /etc/default/josm-latest
-+fi
-+
- JAVA_OPTS="-Djosm.restart=true -Djosm.home=$HOME/.josm-latest -Djava.net.useSystemProxies=true $JAVA_OPTS"
-
- if [ -z "${JAVACMD}" ]; then
---- a/linux/tested/usr/bin/josm
-+++ b/linux/tested/usr/bin/josm
-@@ -20,6 +20,10 @@ else
- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java"
- fi
-
-+if [ -f /etc/default/josm ]; then
-+ . /etc/default/josm
-+fi
-+
- JAVA_OPTS="-Djosm.restart=true -Djava.net.useSystemProxies=true $JAVA_OPTS"
-
- if [ -z "${JAVACMD}" ]; then
---- /dev/null
-+++ b/linux/latest/etc/default/josm-latest
-@@ -0,0 +1,9 @@
-+# Options to pass to java when starting JOSM.
-+# Uncomment the JAVA_OPTS lines to enable their use by /usr/bin/josm-latest
-+
-+# Increase usable memory
-+#JAVA_OPTS="${JAVA_OPTS} -Xmx1024m"
-+
-+# Enable OpenGL pipeline (2D graphic accelerators)
-+#JAVA_OPTS="${JAVA_OPTS} -Dsun.java2d.opengl=True"
-+
---- /dev/null
-+++ b/linux/tested/etc/default/josm
-@@ -0,0 +1,9 @@
-+# Options to pass to java when starting JOSM.
-+# Uncomment the JAVA_OPTS lines to enable their use by /usr/bin/josm
-+
-+# Increase usable memory
-+#JAVA_OPTS="${JAVA_OPTS} -Xmx1024m"
-+
-+# Enable OpenGL pipeline (2D graphic accelerators)
-+#JAVA_OPTS="${JAVA_OPTS} -Dsun.java2d.opengl=True"
-+
diff --git a/debian/patches/series b/debian/patches/series
index d8f5420..419e6a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@
06-move_data_out_of_jar.patch
07-use_system_fonts.patch
08-use_noto_font.patch
-09-josm-default-options.patch
--
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