This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm.
commit 1e32f03053ffdb33c49861e065cf5915d86b7c18 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Thu Mar 5 19:13:44 2015 +0100 Refresh patches. --- debian/changelog | 1 + debian/patches/01-bts.patch | 2 +- debian/patches/02-elemstyles.patch | 2 +- debian/patches/03-default_look_and_feel.patch | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d00fc99..580b421 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ josm (0.0.svn8109+dfsg1-1) UNRELEASED; urgency=medium - Add i18n/convmaps.pl, remove i18n/convwms.pl * Bump minimum required jmapviewer version to 1.06, JOSM uses the new TemplatedTMSTileSource() method introduced in JMapViewer 1.06. + * Refresh patches. -- Bas Couwenberg <sebas...@debian.org> Wed, 04 Mar 2015 21:19:16 +0100 diff --git a/debian/patches/01-bts.patch b/debian/patches/01-bts.patch index c655637..76d2336 100644 --- a/debian/patches/01-bts.patch +++ b/debian/patches/01-bts.patch @@ -86,7 +86,7 @@ bug triaging. ); // Check user is running current tested version, the error may already be fixed int josmVersion = Version.getInstance().getVersion(); -@@ -200,24 +200,13 @@ public final class BugReportExceptionHan +@@ -201,24 +201,13 @@ public final class BugReportExceptionHan JPanel p = new JPanel(new GridBagLayout()); p.add(new JMultilineLabel( diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch index 306955b..3aeb8a6 100644 --- a/debian/patches/02-elemstyles.patch +++ b/debian/patches/02-elemstyles.patch @@ -15,7 +15,7 @@ applications. This patch points josm to the shared directories. --- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java +++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java -@@ -202,14 +202,19 @@ public final class MapPaintStyles { +@@ -229,14 +229,19 @@ public final class MapPaintStyles { } if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) { diff --git a/debian/patches/03-default_look_and_feel.patch b/debian/patches/03-default_look_and_feel.patch index de66fb2..77110ca 100644 --- a/debian/patches/03-default_look_and_feel.patch +++ b/debian/patches/03-default_look_and_feel.patch @@ -11,7 +11,7 @@ Patch rewritten for new code, original patch was from Ubuntu's --- a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java +++ b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java -@@ -98,7 +98,7 @@ public class PlatformHookUnixoid impleme +@@ -157,7 +157,7 @@ public class PlatformHookUnixoid impleme @Override public String getDefaultStyle() { -- 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