This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm.
commit 398bae2e9ca7e8ed9f8057656a8526fc23f902ee Author: Bas Couwenberg <[email protected]> Date: Tue May 31 00:00:32 2016 +0200 Refresh patches. --- debian/changelog | 1 + debian/patches/00-build.patch | 2 +- debian/patches/01-bts.patch | 14 +++++++------- debian/patches/03-default_look_and_feel.patch | 2 +- debian/patches/06-move_data_out_of_jar.patch | 2 +- debian/patches/08-use_noto_font.patch | 4 ++-- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index d2a6534..0d79b3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ josm (0.0.svn10301+dfsg-1) UNRELEASED; urgency=medium * New tested snapshot. + * Refresh patches. -- Bas Couwenberg <[email protected]> Mon, 30 May 2016 23:34:39 +0200 diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch index a20ee43..9a0c6c6 100644 --- a/debian/patches/00-build.patch +++ b/debian/patches/00-build.patch @@ -155,7 +155,7 @@ Forwarded: not-needed </target> <macrodef name="init-test-preferences"> <attribute name="testfamily"/> -@@ -711,6 +715,7 @@ Build-Date: ${build.tstamp} +@@ -715,6 +719,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 90242d9..0c5bc2e 100644 --- a/debian/patches/01-bts.patch +++ b/debian/patches/01-bts.patch @@ -17,7 +17,7 @@ Forwarded: not-needed import javax.swing.BorderFactory; import javax.swing.ImageIcon; import javax.swing.JLabel; -@@ -84,6 +87,8 @@ public class AboutAction extends JosmAct +@@ -84,6 +87,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 class AboutAction extends JosmAct +@@ -93,6 +98,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()); @@ -77,7 +77,7 @@ Forwarded: not-needed ); // Check user is running current tested version, the error may already be fixed int josmVersion = Version.getInstance().getVersion(); -@@ -204,24 +204,14 @@ public final class BugReportExceptionHan +@@ -211,24 +211,14 @@ public final class BugReportExceptionHan JPanel p = new JPanel(new GridBagLayout()); p.add(new JMultilineLabel( @@ -108,20 +108,20 @@ Forwarded: not-needed DebugTextDisplay textarea = new DebugTextDisplay(text); --- a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java +++ b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java -@@ -33,6 +33,7 @@ import org.openstreetmap.josm.gui.prefer - import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference; +@@ -34,6 +34,7 @@ import org.openstreetmap.josm.gui.prefer import org.openstreetmap.josm.gui.preferences.validator.ValidatorTagCheckerRulesPreference; + import org.openstreetmap.josm.io.OsmApi; import org.openstreetmap.josm.plugins.PluginHandler; +import org.openstreetmap.josm.tools.OpenBrowser; import org.openstreetmap.josm.tools.PlatformHookUnixoid; import org.openstreetmap.josm.tools.Shortcut; import org.openstreetmap.josm.tools.bugreport.BugReportSender; -@@ -265,7 +266,7 @@ public final class ShowStatusReportActio +@@ -270,7 +271,7 @@ public final class ShowStatusReportActio switch (ed.showDialog().getValue()) { case 1: ta.copyToClippboard(); break; - case 2: BugReportSender.reportBug(reportHeader); break; + case 2: OpenBrowser.displayUrl("https://bugs.debian.org/";); break; + default: // Do nothing } } - } diff --git a/debian/patches/03-default_look_and_feel.patch b/debian/patches/03-default_look_and_feel.patch index 70ec96d..44d0e5c 100644 --- a/debian/patches/03-default_look_and_feel.patch +++ b/debian/patches/03-default_look_and_feel.patch @@ -6,7 +6,7 @@ Forwarded: not-needed --- a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java +++ b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java -@@ -184,7 +184,7 @@ public class PlatformHookUnixoid impleme +@@ -185,7 +185,7 @@ public class PlatformHookUnixoid impleme @Override public String getDefaultStyle() { diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch index 4d6bd26..a8e1cb1 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 -@@ -200,11 +200,17 @@ public class CachedFile implements Close +@@ -206,11 +206,17 @@ public class CachedFile implements Close 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 64384b0..7b1399e 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 -@@ -1562,7 +1562,7 @@ public class StyledMapRenderer extends A +@@ -1564,7 +1564,7 @@ public class StyledMapRenderer extends A showNames = paintSettings.getShowNamesDistance() > circum; showIcons = paintSettings.getShowIconsDistance() > circum; isOutlineOnly = paintSettings.isOutlineOnly(); @@ -16,7 +16,7 @@ Forwarded: https://josm.openstreetmap.de/ticket/12085 RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF; --- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java +++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java -@@ -127,7 +127,7 @@ public abstract class StyleElement imple +@@ -124,7 +124,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 _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
