This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm.
commit ef1ecf9b4e6d626b77380029a4bd465db0720103 Author: Bas Couwenberg <[email protected]> Date: Tue Oct 3 14:55:39 2017 +0200 Drop bashisms.patch, applied upstream. Refresh remaining patches. --- debian/changelog | 1 + debian/patches/00-build.patch | 14 +++---- debian/patches/01-bts.patch | 56 +++++++++++++-------------- 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 +- debian/patches/bashisms.patch | 27 ------------- debian/patches/series | 1 - 8 files changed, 40 insertions(+), 67 deletions(-) diff --git a/debian/changelog b/debian/changelog index 31b69a6..981838d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ josm (0.0.svn12914+dfsg-1) UNRELEASED; urgency=medium * Change priority from extra to optional. * Bump Standards-Version to 4.1.0, changes: priority. * Update license & copyright for AlphanumComparator.java. + * Drop bashisms.patch, applied upstream. Refresh remaining patches. -- Bas Couwenberg <[email protected]> Tue, 03 Oct 2017 12:45:14 +0200 diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch index 1e5c5ae..bd3b20b 100644 --- a/debian/patches/00-build.patch +++ b/debian/patches/00-build.patch @@ -100,8 +100,8 @@ Forwarded: not-needed </target> <target name="compile-cots" depends="init"> <!-- COTS --> -- <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on" encoding="iso-8859-1" -+ <javac srcdir="${src.dir}" classpathref="classpath" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on" encoding="iso-8859-1" +- <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,gnu/**" nowarn="on" encoding="iso-8859-1" ++ <javac srcdir="${src.dir}" classpathref="classpath" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,gnu/**" nowarn="on" encoding="iso-8859-1" destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false"> <!-- get rid of "internal proprietary API" warning --> <compilerarg value="-XDignore.symbol.file"/> @@ -165,7 +165,7 @@ Forwarded: not-needed <!-- JOSM --> - <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}" + <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath" - excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**" + excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,gnu/**" destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8"> - <compilerclasspath> - <pathelement location="${error_prone_ant.jar}"/> @@ -184,9 +184,9 @@ Forwarded: not-needed - <compilerarg value="-Xep:ShortCircuitBoolean:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/> - <compilerarg value="-Xep:LiteralClassName:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/> <compilerarg line="-Xmaxwarns 1000"/> + <exclude name="org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java" if:set="noJavaFX"/> </javac> - -@@ -347,6 +327,7 @@ Build-Date: ${build.tstamp} +@@ -348,6 +328,7 @@ Build-Date: ${build.tstamp} </uptodate> <mkdir dir="${build.dir}"/> <mkdir dir="${dist.dir}"/> @@ -194,7 +194,7 @@ Forwarded: not-needed </target> <target name="javadoc" depends="init-properties"> <javadoc destdir="javadoc" -@@ -379,6 +360,7 @@ Build-Date: ${build.tstamp} +@@ -380,6 +361,7 @@ Build-Date: ${build.tstamp} <delete file="${src.dir}/org/w3/_2001/xmlschema/Adapter1.java"/> <delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/> <delete file="${epsg.output}"/> @@ -202,7 +202,7 @@ Forwarded: not-needed </target> <macrodef name="init-test-preferences"> <attribute name="testfamily"/> -@@ -856,6 +838,7 @@ Build-Date: ${build.tstamp} +@@ -880,6 +862,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 7403230..71e58bf 100644 --- a/debian/patches/01-bts.patch +++ b/debian/patches/01-bts.patch @@ -66,15 +66,15 @@ Forwarded: not-needed * --- a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java +++ b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java -@@ -38,6 +38,7 @@ import org.openstreetmap.josm.gui.util.G - import org.openstreetmap.josm.io.OsmApi; +@@ -39,6 +39,7 @@ import org.openstreetmap.josm.io.OsmApi; import org.openstreetmap.josm.plugins.PluginHandler; + import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.tools.Logging; +import org.openstreetmap.josm.tools.OpenBrowser; import org.openstreetmap.josm.tools.PlatformHookUnixoid; import org.openstreetmap.josm.tools.Shortcut; import org.openstreetmap.josm.tools.Utils; -@@ -299,7 +300,7 @@ public final class ShowStatusReportActio +@@ -300,7 +301,7 @@ public final class ShowStatusReportActio switch (ed.showDialog().getValue()) { case 1: ta.copyToClipboard(); break; @@ -85,7 +85,16 @@ Forwarded: not-needed } --- a/src/org/openstreetmap/josm/gui/bugreport/BugReportDialog.java +++ b/src/org/openstreetmap/josm/gui/bugreport/BugReportDialog.java -@@ -93,7 +93,8 @@ public class BugReportDialog extends JDi +@@ -73,7 +73,7 @@ public class BugReportDialog extends JDi + errorPanel.add(new JMultilineLabel( + tr("Opening the bug report failed. Please report manually using this website:")), + GBC.eol().fill(GridBagConstraints.HORIZONTAL)); +- errorPanel.add(new UrlLabel(Main.getJOSMWebsite() + "/newticket", 2), GBC.eop().insets(8, 0, 0, 0)); ++ errorPanel.add(new UrlLabel("https://bugs.debian.org/";, 2), GBC.eop().insets(8, 0, 0, 0)); + errorPanel.add(new DebugTextDisplay(statusText)); + + JOptionPane.showMessageDialog(Main.parent, errorPanel, tr("You have encountered a bug in JOSM"), +@@ -123,7 +123,8 @@ public class BugReportDialog extends JDi private void addMessageSection() { String message = tr( "An unexpected exception occurred.\n" + "This is always a coding error. If you are running the latest " @@ -95,7 +104,7 @@ Forwarded: not-needed Icon icon = UIManager.getIcon("OptionPane.errorIcon"); JPanel panel = new JPanel(new GridBagLayout()); -@@ -111,7 +112,7 @@ public class BugReportDialog extends JDi +@@ -141,7 +142,7 @@ public class BugReportDialog extends JDi panel.add(textPanel, GBC.eop().fill()); panel.add(new JLabel(tr("Manually report at:")+' '), GBC.std()); @@ -104,7 +113,7 @@ Forwarded: not-needed JButton copy = new JButton("Copy to clipboard"); copy.addActionListener(e -> textPanel.copyToClipboard()); panel.add(copy, GBC.eol().anchor(GBC.EAST)); -@@ -131,8 +132,7 @@ public class BugReportDialog extends JDi +@@ -161,8 +162,7 @@ public class BugReportDialog extends JDi JMultilineLabel helpText = new JMultilineLabel( tr("If you are running the latest version of JOSM and the plugins, " + "please file a bug report in our bugtracker.\n" @@ -114,7 +123,7 @@ Forwarded: not-needed + "the error and try to supply as much detail as possible.")); helpText.setMaxWidth(MAX_MESSAGE_SIZE); panel.add(helpText, GBC.eop().fill(GridBagConstraints.HORIZONTAL)); -@@ -144,9 +144,6 @@ public class BugReportDialog extends JDi +@@ -174,9 +174,6 @@ public class BugReportDialog extends JDi } panel.add(settings); @@ -126,27 +135,27 @@ Forwarded: not-needed --- a/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java +++ b/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java -@@ -59,16 +59,13 @@ public class BugReportSender extends Thr +@@ -88,9 +88,7 @@ public class BugReportSender extends Thr @Override public void run() { try { - // first, send the debug text using post. - String debugTextPasteId = pasteDebugText(); -- -- // then open a browser to display the pasted text. -- String openBrowserError = OpenBrowser.displayUrl(getJOSMTicketURL() + "?pdata_stored=" + debugTextPasteId); -+ // open a browser to https://bugs.debian.org/ -+ String openBrowserError = OpenBrowser.displayUrl(getJOSMTicketURL()); - if (openBrowserError != null) { - Logging.warn(openBrowserError); - failed(openBrowserError); +- String bugUrl = getJOSMTicketURL() + "?pdata_stored=" + debugTextPasteId; ++ String bugUrl = "https://bugs.debian.org/";; + + // then notify handler + errorMessage = handler.sendingBugReport(bugUrl, statusText); +@@ -98,7 +96,7 @@ public class BugReportSender extends Thr + Logging.warn(errorMessage); + handler.failed(errorMessage, statusText); } - } catch (BugReportSenderException e) { + } catch (Exception e) { Logging.warn(e); - failed(e.getMessage()); - } -@@ -103,7 +100,7 @@ public class BugReportSender extends Thr + errorMessage = e.getMessage(); + handler.failed(errorMessage, statusText); +@@ -134,7 +132,7 @@ public class BugReportSender extends Thr } private static String getJOSMTicketURL() { @@ -155,12 +164,3 @@ Forwarded: not-needed } private static String retrieveDebugToken(Document document) throws XPathExpressionException, BugReportSenderException { -@@ -134,7 +131,7 @@ public class BugReportSender extends Thr - errorPanel.add(new JMultilineLabel( - tr("Opening the bug report failed. Please report manually using this website:")), - GBC.eol().fill(GridBagConstraints.HORIZONTAL)); -- errorPanel.add(new UrlLabel(Main.getJOSMWebsite() + "/newticket", 2), GBC.eop().insets(8, 0, 0, 0)); -+ errorPanel.add(new UrlLabel("https://bugs.debian.org/";, 2), GBC.eop().insets(8, 0, 0, 0)); - errorPanel.add(new DebugTextDisplay(statusText)); - - JOptionPane.showMessageDialog(Main.parent, errorPanel, tr("You have encountered a bug in JOSM"), diff --git a/debian/patches/03-default_look_and_feel.patch b/debian/patches/03-default_look_and_feel.patch index b6875f1..b4846af 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 -@@ -111,7 +111,7 @@ public class PlatformHookUnixoid impleme +@@ -86,7 +86,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 07b36bf..a94156e 100644 --- a/debian/patches/06-move_data_out_of_jar.patch +++ b/debian/patches/06-move_data_out_of_jar.patch @@ -44,7 +44,7 @@ Forwarded: not-needed /** --- a/src/org/openstreetmap/josm/io/CachedFile.java +++ b/src/org/openstreetmap/josm/io/CachedFile.java -@@ -207,11 +207,17 @@ public class CachedFile implements Close +@@ -208,11 +208,17 @@ public class CachedFile implements Close File file = getFile(); if (file == null) { if (name != null && name.startsWith("resource://")) { diff --git a/debian/patches/08-use_noto_font.patch b/debian/patches/08-use_noto_font.patch index 5a55ed7..d5408d1 100644 --- a/debian/patches/08-use_noto_font.patch +++ b/debian/patches/08-use_noto_font.patch @@ -9,8 +9,8 @@ Forwarded: https://josm.openstreetmap.de/ticket/12085 synchronized (lock) { n = defaultFontName; if (n == null) { -- defaultFontName = n = Main.pref.get("mappaint.font", "Droid Sans"); -+ defaultFontName = n = Main.pref.get("mappaint.font", "Noto Sans"); +- defaultFontName = n = Config.getPref().get("mappaint.font", "Droid Sans"); ++ defaultFontName = n = Config.getPref().get("mappaint.font", "Noto Sans"); } } } diff --git a/debian/patches/bashisms.patch b/debian/patches/bashisms.patch deleted file mode 100644 index 638e85f..0000000 --- a/debian/patches/bashisms.patch +++ /dev/null @@ -1,27 +0,0 @@ -Description: Fix bashism, pattern match only works with bash as /bin/sh. -Author: Bas Couwenberg <[email protected]> -Forwarded: https://josm.openstreetmap.de/ticket/15233 -Applied-Upstream: https://josm.openstreetmap.de/changeset/12717/josm - ---- a/linux/tested/usr/bin/josm -+++ b/linux/tested/usr/bin/josm -@@ -46,7 +46,7 @@ fi - - if [ "$JAVACMD" ]; then - echo "Using $JAVACMD to execute josm." || true -- if [[ $JAVACMD == *"java-9"* ]]; then -+ if [ "`expr match \"${JAVACMD}\" 'java-9'`" != "0" ]; then - JAVA_OPTS="--add-modules java.se.ee $JAVA_OPTS" - fi - set +e ---- a/linux/latest/usr/bin/josm-latest -+++ b/linux/latest/usr/bin/josm-latest -@@ -46,7 +46,7 @@ fi - - if [ "$JAVACMD" ]; then - echo "Using $JAVACMD to execute josm-latest." || true -- if [[ $JAVACMD == *"java-9"* ]]; then -+ if [ "`expr match \"${JAVACMD}\" 'java-9'`" != "0" ]; then - JAVA_OPTS="--add-modules java.se.ee $JAVA_OPTS" - fi - set +e diff --git a/debian/patches/series b/debian/patches/series index 2e1cc81..0e16b21 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,4 +6,3 @@ 06-move_data_out_of_jar.patch 07-use_system_fonts.patch 08-use_noto_font.patch -bashisms.patch -- 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
