This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm.
commit e5ca98e441542283a9ad1ada6b6cc47978691098 Author: Bas Couwenberg <[email protected]> Date: Mon Sep 19 16:06:08 2016 +0200 Update 06-move_data_out_of_jar.patch to also handle help-browser.css. (closes: #838247) --- debian/changelog | 2 + debian/patches/06-move_data_out_of_jar.patch | 66 +++++++++++++++++++++------- 2 files changed, 53 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7d5835f..f85359d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ josm (0.0.svn10966+dfsg-2) UNRELEASED; urgency=medium * Fix 'Contributors' typo in copyright file. + * Update 06-move_data_out_of_jar.patch to also handle help-browser.css. + (closes: #838247) -- Bas Couwenberg <[email protected]> Mon, 19 Sep 2016 16:04:17 +0200 diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch index 70fac82..17177f4 100644 --- a/debian/patches/06-move_data_out_of_jar.patch +++ b/debian/patches/06-move_data_out_of_jar.patch @@ -4,6 +4,21 @@ Author: Paul Hartmann <[email protected]> Bug-Debian: https://bugs.debian.org/698608 Forwarded: not-needed +--- a/build.xml ++++ b/build.xml +@@ -155,9 +155,9 @@ Debian-Release: ${debian.version} + <attribute name="Debian-Release" value="${debian.version}"/> + <attribute name="Class-Path" value="${classpathprop}"/> + </manifest> +- <zipfileset dir="images" prefix="images"/> +- <zipfileset dir="data" prefix="data"/> +- <zipfileset dir="styles" prefix="styles"/> ++ <!--<zipfileset dir="images" prefix="images"/>--> ++ <!--<zipfileset dir="data" prefix="data"/>--> ++ <!--<zipfileset dir="styles" prefix="styles"/>--> + </jar> + </target> + <!-- Mac OS X target --> --- a/src/org/openstreetmap/josm/tools/I18n.java +++ b/src/org/openstreetmap/josm/tools/I18n.java @@ -10,6 +10,7 @@ import java.io.InputStream; @@ -52,18 +67,39 @@ Forwarded: not-needed } else { throw new IOException("No file found for: "+name); } ---- a/build.xml -+++ b/build.xml -@@ -155,9 +155,9 @@ Debian-Release: ${debian.version} - <attribute name="Debian-Release" value="${debian.version}"/> - <attribute name="Class-Path" value="${classpathprop}"/> - </manifest> -- <zipfileset dir="images" prefix="images"/> -- <zipfileset dir="data" prefix="data"/> -- <zipfileset dir="styles" prefix="styles"/> -+ <!--<zipfileset dir="images" prefix="images"/>--> -+ <!--<zipfileset dir="data" prefix="data"/>--> -+ <!--<zipfileset dir="styles" prefix="styles"/>--> - </jar> - </target> - <!-- Mac OS X target --> +--- a/src/org/openstreetmap/josm/gui/help/HelpBrowser.java ++++ b/src/org/openstreetmap/josm/gui/help/HelpBrowser.java +@@ -15,6 +15,7 @@ import java.awt.event.WindowAdapter; + import java.awt.event.WindowEvent; + import java.io.BufferedReader; + import java.io.IOException; ++import java.io.InputStream; + import java.io.InputStreamReader; + import java.io.StringReader; + import java.nio.charset.StandardCharsets; +@@ -49,6 +50,7 @@ import org.openstreetmap.josm.gui.HelpAw + import org.openstreetmap.josm.gui.MainMenu; + import org.openstreetmap.josm.gui.widgets.JosmEditorPane; + import org.openstreetmap.josm.gui.widgets.JosmHTMLEditorKit; ++import org.openstreetmap.josm.io.CachedFile; + import org.openstreetmap.josm.tools.ImageProvider; + import org.openstreetmap.josm.tools.InputMapUtils; + import org.openstreetmap.josm.tools.LanguageInfo.LocaleType; +@@ -139,11 +141,12 @@ public class HelpBrowser extends JDialog + protected StyleSheet buildStyleSheet() { + StyleSheet ss = new StyleSheet(); + StringBuilder css = new StringBuilder(); +- try (BufferedReader breader = new BufferedReader( +- new InputStreamReader( +- getClass().getResourceAsStream("/data/help-browser.css"), StandardCharsets.UTF_8 +- ) +- )) { ++ try (CachedFile cf = new CachedFile("resource://data/help-browser.css"); ++ InputStream cssStream = cf.getInputStream(); ++ BufferedReader breader = new BufferedReader( ++ new InputStreamReader(cssStream, StandardCharsets.UTF_8) ++ ) ++ ) { + String line; + while ((line = breader.readLine()) != null) { + css.append(line); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
