This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit 016f8b10d7b5ad134c4672c15be7fd4bc116dc64
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Tue Nov 10 21:51:06 2015 +0100
Use Noto instead of Droid fonts.
---
debian/changelog | 7 +++++++
debian/control | 2 +-
debian/patches/07-use_system_fonts.patch | 16 ++++++++++++++--
debian/patches/09-use_noto_font.patch | 26 ++++++++++++++++++++++++++
debian/patches/series | 1 +
5 files changed, 49 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4492226..ed9187b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+josm (0.0.svn8969+dfsg-4) UNRELEASED; urgency=medium
+
+ * Use Noto instead of Droid fonts.
+ (closes: #804683)
+
+ -- Bas Couwenberg <sebas...@debian.org> Tue, 10 Nov 2015 21:50:19 +0100
+
josm (0.0.svn8969+dfsg-3) unstable; urgency=medium
* Move from experimental to unstable.
diff --git a/debian/control b/debian/control
index 11e2058..8958f27 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Depends: default-jre | java7-runtime,
liboauth-signpost-java (>= 1.2),
openstreetmap-map-icons-classic,
jmapviewer (>= 1.11),
- fonts-droid,
+ fonts-noto,
${misc:Depends}
Recommends: josm-plugins,
josm-l10n,
diff --git a/debian/patches/07-use_system_fonts.patch
b/debian/patches/07-use_system_fonts.patch
index d25daf8..e680946 100644
--- a/debian/patches/07-use_system_fonts.patch
+++ b/debian/patches/07-use_system_fonts.patch
@@ -1,15 +1,27 @@
-Description: Use system droid fonts, instead of the embedded ones.
+Description: Use system Noto fonts, instead of the embedded Droid fonts.
Author: David Paleino <da...@debian.org>
+Author: Bas Couwenberg <sebas...@debian.org>
Forwarded: not-needed
--- a/src/org/openstreetmap/josm/tools/FontsManager.java
+++ b/src/org/openstreetmap/josm/tools/FontsManager.java
+@@ -22,8 +22,8 @@ public final class FontsManager {
+ * List of fonts embedded into JOSM jar.
+ */
+ private static final Collection<String> INCLUDED_FONTS = Arrays.asList(
+- "DroidSans.ttf",
+- "DroidSans-Bold.ttf"
++ "NotoSans-Regular.ttf",
++ "NotoSans-Bold.ttf"
+ );
+
+ private FontsManager() {
@@ -36,7 +36,7 @@ public final class FontsManager {
public static void initialize() {
GraphicsEnvironment ge =
GraphicsEnvironment.getLocalGraphicsEnvironment();
for (String fontFile : INCLUDED_FONTS) {
- String url = "resource://data/fonts/"+fontFile;
-+ String url = "/usr/share/fonts/truetype/droid/"+fontFile;
++ String url = "/usr/share/fonts/truetype/noto/"+fontFile;
try (InputStream i = new CachedFile(url).getInputStream()) {
ge.registerFont(Font.createFont(Font.TRUETYPE_FONT, i));
} catch (IOException | FontFormatException ex) {
diff --git a/debian/patches/09-use_noto_font.patch
b/debian/patches/09-use_noto_font.patch
new file mode 100644
index 0000000..6c24dcd
--- /dev/null
+++ b/debian/patches/09-use_noto_font.patch
@@ -0,0 +1,26 @@
+Description: Use Noto font instead of Droid.
+Author: Bas Couwenberg <sebas...@debian.org>
+Bug-Debian: https://bugs.debian.org/804683
+
+--- 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
+ showNames = paintSettings.getShowNamesDistance() > circum;
+ showIcons = paintSettings.getShowIconsDistance() > circum;
+ isOutlineOnly = paintSettings.isOutlineOnly();
+- orderFont = new Font(Main.pref.get("mappaint.font", "Droid Sans"),
Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
++ orderFont = new Font(Main.pref.get("mappaint.font", "Noto Sans"),
Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
+
+ 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
+ synchronized (lock) {
+ n = DEFAULT_FONT_NAME;
+ if (n == null) {
+- DEFAULT_FONT_NAME = n = Main.pref.get("mappaint.font",
"Droid Sans");
++ DEFAULT_FONT_NAME = n = Main.pref.get("mappaint.font",
"Noto Sans");
+ }
+ }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 6954d6a..6fc2aed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
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
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
