[josm] 04/08: Drop 08-josm-alternatives.patch, applied upstream. Refresh remaining patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Nov 24 09:26:17 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 958e244d9b13b2341acb4df2d853c9c848fe47ad
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Nov 24 09:42:39 2015 +0100
Drop 08-josm-alternatives.patch, applied upstream. Refresh remaining patches.
---
debian/changelog | 2 +
debian/patches/01-bts.patch | 18 +++---
debian/patches/06-move_data_out_of_jar.patch | 8 +--
debian/patches/08-josm-alternatives.patch | 87 ----------------------------
debian/patches/09-use_noto_font.patch | 2 +-
debian/patches/series | 1 -
6 files changed, 16 insertions(+), 102 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 39e4c1e..64b5592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
josm (0.0.svn9060+dfsg-1) UNRELEASED; urgency=medium
* New tested snapshot.
+ * Drop 08-josm-alternatives.patch, applied upstream.
+ Refresh remaining patches.
-- Bas Couwenberg <sebastic at debian.org> Tue, 24 Nov 2015 09:15:47 +0100
diff --git a/debian/patches/01-bts.patch b/debian/patches/01-bts.patch
index 6ec0bf6..63f0e74 100644
--- a/debian/patches/01-bts.patch
+++ b/debian/patches/01-bts.patch
@@ -7,9 +7,9 @@ Forwarded: not-needed
--- a/src/org/openstreetmap/josm/actions/AboutAction.java
+++ b/src/org/openstreetmap/josm/actions/AboutAction.java
-@@ -9,6 +9,9 @@ import java.awt.Image;
- import java.awt.event.ActionEvent;
- import java.awt.event.KeyEvent;
+@@ -14,6 +14,9 @@ import java.io.IOException;
+ import java.io.InputStream;
+ import java.io.InputStreamReader;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
@@ -17,7 +17,7 @@ Forwarded: not-needed
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
-@@ -80,6 +83,8 @@ public class AboutAction extends JosmAct
+@@ -86,6 +89,8 @@ public class AboutAction extends JosmAct
"<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>" +
-@@ -90,8 +95,7 @@ public class AboutAction extends JosmAct
+@@ -96,8 +101,7 @@ public class AboutAction extends JosmAct
info.add(new UrlLabel(Main.getJOSMWebsite(), 2), GBC.eol().fill(GBC.HORIZONTAL));
info.add(GBC.glue(0, 5), GBC.eol());
info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(10, 0, 10, 0));
@@ -38,7 +38,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
-@@ -66,6 +66,7 @@ public class Version {
+@@ -37,6 +37,7 @@ public class Version {
private int version;
private String releaseDescription;
@@ -46,7 +46,7 @@ Forwarded: not-needed
private String time;
private String buildName;
private boolean isLocalBuild;
-@@ -116,6 +117,8 @@ public class Version {
+@@ -74,6 +75,8 @@ public class Version {
version = JOSM_UNKNOWN_VERSION;
}
@@ -54,8 +54,8 @@ Forwarded: not-needed
+
// the last changed data
//
- time = properties.get("Last Changed Date");
-@@ -172,6 +175,10 @@ public class Version {
+ time = properties.getProperty("Last Changed Date");
+@@ -130,6 +133,10 @@ public class Version {
return version == 0 ? tr("UNKNOWN") : Integer.toString(version);
}
diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch
index d35fdd5..144caa1 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -6,15 +6,15 @@ Forwarded: not-needed
--- a/src/org/openstreetmap/josm/tools/I18n.java
+++ b/src/org/openstreetmap/josm/tools/I18n.java
-@@ -8,6 +8,7 @@ import java.io.FileInputStream;
- import java.io.IOException;
- import java.io.InputStream;
+@@ -10,6 +10,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;
-@@ -352,7 +353,11 @@ public final class I18n {
+@@ -364,7 +365,11 @@ public final class I18n {
}
private static URL getTranslationFile(String lang) {
diff --git a/debian/patches/08-josm-alternatives.patch b/debian/patches/08-josm-alternatives.patch
deleted file mode 100644
index 4f5534f..0000000
--- a/debian/patches/08-josm-alternatives.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Description: Simplify java alternatives testing.
- Test JDK versions in order of preference: JDK 8, 7, 9.
- When no (non-headless) OpenJDK package is installed, test for the Oracle JDK versions.
- Break out of testing loops when a suitable java command is found.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://josm.openstreetmap.de/ticket/12033
-Applied-Upstream: https://josm.openstreetmap.de/changeset/8970/josm
-
---- a/linux/tested/usr/bin/josm
-+++ b/linux/tested/usr/bin/josm
-@@ -11,52 +11,36 @@ ARCH="`dpkg --print-architecture 2> /dev
-
- # If OpenJDK is only available headless, do not try it
- if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then
-- JAVA9_CMDS="/usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java /usr/lib/jvm/java-9-oracle/bin/java"
-- JAVA8_CMDS="/usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java /usr/lib/jvm/java-8-oracle/bin/java"
-- JAVA7_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-openjdk/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-7-oracle/bin/java"
-+ JAVA_CMDS="$JAVA_HOME/bin/java"
-+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java /usr/lib/jvm/java-8-oracle/bin/java"
-+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-7-openjdk/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-7-oracle/bin/java"
-+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java /usr/lib/jvm/java-9-oracle/bin/java"
- else
-- JAVA9_CMDS="/usr/lib/jvm/java-9-oracle/bin/java"
-- JAVA8_CMDS="/usr/lib/jvm/java-8-oracle/bin/java"
-- JAVA7_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/bin/java"
-+ JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java"
-+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-oracle/bin/java"
-+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-7-oracle/bin/java"
-+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java"
- fi
-
- JAVA_OPTS="-Djosm.restart=true -Djava.net.useSystemProxies=true $JAVA_OPTS"
-
--for jcmd in $JAVA8_CMDS; do
-- if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
-- JAVACMD="$jcmd"
-- fi
--done
--
--for jcmd in $JAVA8_CMDS; do
-- if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
-- JAVACMD="$jcmd"
-- fi
--done
--
--for jcmd in $JAVA7_CMDS; do
-- if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
-- JAVACMD="$jcmd"
-- fi
--done
--
--for jcmd in $JAVA7_CMDS; do
-- if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
-- JAVACMD="$jcmd"
-- fi
--done
--
--for jcmd in $JAVA9_CMDS; do
-- if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
-- JAVACMD="$jcmd"
-- fi
--done
-+if [ -z "${JAVACMD}" ]; then
-+ for jcmd in $JAVA_CMDS; do
-+ if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
-+ JAVACMD="$jcmd"
-+ break
-+ fi
-+ done
-+fi
-
--for jcmd in $JAVA9_CMDS; do
-- if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
-- JAVACMD="$jcmd"
-- fi
--done
-+if [ -z "${JAVACMD}" ]; then
-+ for jcmd in $JAVA_CMDS; do
-+ if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
-+ JAVACMD="$jcmd"
-+ break
-+ fi
-+ done
-+fi
-
- if [ "$JAVACMD" ]; then
- echo "Using $JAVACMD to execute josm." || true
diff --git a/debian/patches/09-use_noto_font.patch b/debian/patches/09-use_noto_font.patch
index 3a8be61..591f5b6 100644
--- a/debian/patches/09-use_noto_font.patch
+++ b/debian/patches/09-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
-@@ -1446,7 +1446,7 @@ public class StyledMapRenderer extends A
+@@ -1463,7 +1463,7 @@ public class StyledMapRenderer extends A
showNames = paintSettings.getShowNamesDistance() > circum;
showIcons = paintSettings.getShowIconsDistance() > circum;
isOutlineOnly = paintSettings.isOutlineOnly();
diff --git a/debian/patches/series b/debian/patches/series
index 6fc2aed..eafe33a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,4 @@
05-fix_version.patch
06-move_data_out_of_jar.patch
07-use_system_fonts.patch
-08-josm-alternatives.patch
09-use_noto_font.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