This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm.
commit aa32a665fdda8532408399eb69afc31ad1ba4274 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Oct 9 13:18:41 2015 +0200 Update patches, drop disabled patches, use groovy2 package. --- debian/changelog | 3 +- debian/control | 3 +- debian/patches/00-build.patch | 84 ++++++------- debian/patches/01-bts.patch | 53 ++++---- debian/patches/02-elemstyles.patch | 16 +-- debian/patches/03-default_look_and_feel.patch | 2 +- debian/patches/04-fix_images.patch | 29 ----- debian/patches/04-use_system_jmapviewer.patch | 2 +- debian/patches/05-fix_version.patch | 2 +- debian/patches/06-move_data_out_of_jar.patch | 12 +- debian/patches/07-use_system_fonts.patch | 6 +- debian/patches/08-disable_gettext-merge.patch | 43 ------- debian/patches/08-use_external_json_library.patch | 145 ---------------------- debian/patches/100-fix_SlippyMapBBoxChooser.patch | 24 ---- debian/patches/series | 3 - 15 files changed, 90 insertions(+), 337 deletions(-) diff --git a/debian/changelog b/debian/changelog index 08e770f..8a47884 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ josm (0.0.svn8800+dfsg1-1) UNRELEASED; urgency=medium * New tested snapshot. (closes: #785416, #785417) - * Refresh patches, add dependencies for commons-jcs & commons-logging. + * Add dependencies for commons-logging. * Update copyright file. + * Update patches, drop disabled patches, use groovy2 package. -- Bas Couwenberg <sebas...@debian.org> Fri, 09 Oct 2015 12:44:31 +0200 diff --git a/debian/control b/debian/control index 2c525bd..1d8c444 100644 --- a/debian/control +++ b/debian/control @@ -12,10 +12,10 @@ Build-Depends: debhelper (>= 9~), ant-contrib, javacc, gettext, + groovy2, libandroid-json-org-java, libcommons-codec-java, libcommons-compress-java, - libcommons-jcs-java, libcommons-logging-java, libgettext-ant-tasks-java, libgettext-commons-java (>= 0.9.6), @@ -35,7 +35,6 @@ Depends: default-jre | java7-runtime, libandroid-json-org-java, libcommons-codec-java, libcommons-compress-java, - libcommons-jcs-java, libcommons-logging-java, libgettext-commons-java (>= 0.9.6), libmetadata-extractor-java (>= 2.7.2), diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch index a1c3244..028c44e 100644 --- a/debian/patches/00-build.patch +++ b/debian/patches/00-build.patch @@ -13,17 +13,19 @@ JARs and not depend on Internet connection. --- a/build.xml +++ b/build.xml -@@ -14,6 +14,7 @@ +@@ -14,7 +14,8 @@ <property name="build.dir" location="build"/> <property name="javacc.home" location="tools"/> <property name="mapcss.dir" location="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss"/> +- <property name="groovy.jar" location="tools/groovy-all-2.4.4.jar"/> + <property name="antcontrib.jar" value="/usr/share/java/ant-contrib.jar"/> - <property name="imagerytypes.dir" location="${src.dir}/org/openstreetmap/josm/data/imagery/types"/> ++ <property name="groovy.jar" location="/usr/share/java/groovy-all-2.x.jar"/> <!-- build parameter: compression level (ant -Dclevel=N) N ranges from 0 (no compression) to 9 (maximum compression) -@@ -25,6 +26,21 @@ - <condition property="isWindows"> - <os family="Windows"/> + default: 9 --> +@@ -29,6 +30,20 @@ + <condition property="isJava9"> + <equals arg1="${ant.java.version}" arg2="1.9" /> </condition> + <!-- Java classpath addition (all jar files to compile tests with this) --> + <path id="classpath"> @@ -34,7 +36,6 @@ JARs and not depend on Internet connection. + <include name="signpost-core.jar"/> + <include name="commons-codec.jar"/> + <include name="commons-compress.jar"/> -+ <include name="commons-jcs.jar"/> + <include name="commons-logging.jar"/> + <include name="jmapviewer.jar"/> + </fileset> @@ -43,7 +44,7 @@ JARs and not depend on Internet connection. <!-- ** Used by Eclipse ant builder for updating -@@ -71,10 +87,9 @@ +@@ -75,10 +90,9 @@ <!-- ** Creates the REVISION file to be included in the distribution --> @@ -56,7 +57,7 @@ JARs and not depend on Internet connection. <tstamp> <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/> </tstamp> -@@ -87,6 +102,7 @@ +@@ -91,6 +105,7 @@ Revision: ${version.entry.commit.revision} Is-Local-Build: true Build-Date: ${build.tstamp} @@ -64,7 +65,7 @@ JARs and not depend on Internet connection. </echo> </target> <!-- -@@ -106,7 +122,8 @@ Build-Date: ${build.tstamp} +@@ -110,7 +125,8 @@ Build-Date: ${build.tstamp} <copy file="README" todir="build"/> <copy file="LICENSE" todir="build"/> <!-- create josm-custom.jar --> @@ -74,7 +75,7 @@ JARs and not depend on Internet connection. <jar destfile="dist/josm-custom.jar" basedir="build" level="${clevel}"> <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar --> <manifest> -@@ -116,6 +133,8 @@ Build-Date: ${build.tstamp} +@@ -120,6 +136,8 @@ Build-Date: ${build.tstamp} <attribute name="Permissions" value="all-permissions"/> <attribute name="Codebase" value="josm.openstreetmap.de"/> <attribute name="Application-Name" value="JOSM - Java OpenStreetMap Editor"/> @@ -83,7 +84,7 @@ JARs and not depend on Internet connection. </manifest> <zipfileset dir="images" prefix="images"/> <zipfileset dir="data" prefix="data"/> -@@ -186,10 +205,7 @@ Build-Date: ${build.tstamp} +@@ -190,10 +208,7 @@ Build-Date: ${build.tstamp} </target> <target name="javacc" depends="init" unless="javacc.notRequired"> <mkdir dir="${mapcss.dir}/parsergen"/> @@ -95,15 +96,10 @@ JARs and not depend on Internet connection. <arg value="-DEBUG_PARSER=false"/> <arg value="-DEBUG_TOKEN_MANAGER=false"/> <arg value="-JDK_VERSION=1.7"/> -@@ -214,32 +230,10 @@ Build-Date: ${build.tstamp} - </exec> - </target> - <target name="compile" depends="init,javacc,jaxb"> -- <!-- COTS --> -- <javac srcdir="${src.dir}" includes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on" encoding="iso-8859-1" -- destdir="build" target="1.7" source="1.7" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false"> -- <!-- get rid of "internal proprietary API" warning --> -- <compilerarg value="-XDignore.symbol.file"/> +@@ -208,27 +223,15 @@ Build-Date: ${build.tstamp} + destdir="build" target="1.7" source="1.7" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false"> + <!-- get rid of "internal proprietary API" warning --> + <compilerarg value="-XDignore.symbol.file"/> - <exclude name="org/apache/commons/compress/compressors/lzma/**"/> - <exclude name="org/apache/commons/compress/compressors/xz/**"/> - <exclude name="org/apache/commons/compress/compressors/CompressorStreamFactory.java"/> @@ -113,25 +109,25 @@ JARs and not depend on Internet connection. - <exclude name="org/apache/commons/compress/compressors/pack200/**"/> - <exclude name="org/apache/commons/compress/compressors/snappy/**"/> - <exclude name="org/apache/commons/compress/compressors/z/**"/> -- <exclude name="org/apache/commons/jcs/admin/**"/> -- <exclude name="org/apache/commons/jcs/auxiliary/disk/jdbc/**"/> -- <exclude name="org/apache/commons/jcs/auxiliary/remote/**"/> -- <exclude name="org/apache/commons/jcs/utils/servlet/**"/> + <exclude name="org/apache/commons/jcs/admin/**"/> + <exclude name="org/apache/commons/jcs/auxiliary/disk/jdbc/**"/> + <exclude name="org/apache/commons/jcs/auxiliary/remote/**"/> + <exclude name="org/apache/commons/jcs/utils/servlet/**"/> - <exclude name="org/apache/commons/logging/impl/AvalonLogger.java"/> - <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java"/> - <exclude name="org/apache/commons/logging/impl/Log4JLogger.java"/> - <exclude name="org/apache/commons/logging/impl/LogKitLogger.java"/> - <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java"/> -- </javac> + </javac> + <!-- I18N --> + <ant dir="i18n" /> - <!-- JMapViewer/JOSM --> -- <javac srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java" -+ <javac srcdir="${src.dir}" classpathref="classpath" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java" + <!-- JMapViewer --> +- <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**" ++ <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**" destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8"> <compilerarg value="-Xlint:cast"/> <compilerarg value="-Xlint:deprecation"/> -@@ -268,6 +262,7 @@ Build-Date: ${build.tstamp} +@@ -272,6 +275,7 @@ Build-Date: ${build.tstamp} </uptodate> <mkdir dir="build"/> <mkdir dir="dist"/> @@ -139,10 +135,10 @@ JARs and not depend on Internet connection. </target> <target name="javadoc"> <javadoc destdir="javadoc" -@@ -289,6 +284,7 @@ Build-Date: ${build.tstamp} - <delete dir="dist"/> +@@ -294,6 +298,7 @@ Build-Date: ${build.tstamp} <delete dir="${mapcss.dir}/parsergen"/> - <delete dir="${imagerytypes.dir}"/> + <delete file="${src.dir}/org/w3/_2001/xmlschema/Adapter1.java"/> + <delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/> + <ant target="clean" dir="i18n"/> </target> <path id="test.classpath"> @@ -156,10 +152,10 @@ JARs and not depend on Internet connection. - <property name="josm.build.dir" value="../core"/> + <property name="josm.build.dir" value=".."/> <property name="josm.presets" value="${josm.build.dir}/data/defaultpresets.xml"/> - <!--<property name="josm.style" value="${josm.build.dir}/styles/standard/elemstyles.xml"/>--> <property name="plugin.dir" value="../plugins"/> + <property name="maps.srcfile" value="http://josm.openstreetmap.de/maps"/> @@ -12,8 +12,8 @@ - <property name="i18n.install.dir" value="${josm.build.dir}/data"/> + <property name="i18n_data.install.dir" value="${josm.build.dir}/data_nodist/trans"/> <property name="po.build.dir" value="${i18n.build.dir}"/> <property name="ant.build.javac.target" value="1.5"/> - <property name="gettexttasks.jar" value="lib/gettext-ant-tasks-0.9.7.jar"/> @@ -168,20 +164,20 @@ JARs and not depend on Internet connection. + <property name="antcontrib.jar" value="/usr/share/java/ant-contrib.jar"/> <target name="init" description="Loads the Ant gettext and contrib tasks"> <taskdef name="gettext-extract" classname="org.xnap.commons.ant.gettext.GettextExtractKeysTask" classpath="${gettexttasks.jar}"/> - <taskdef name="gettext-merge" classname="org.xnap.commons.ant.gettext.GettextMergeKeysTask" classpath="${gettexttasks.jar}"/> -@@ -81,14 +81,14 @@ - <arg line="--unique po/core.pot ${i18n.build.dir}/core.2.pot ${i18n.build.dir}/plugins.raw.pot"/> - </exec> + <!-- for the <foreach> possibility --> +@@ -92,14 +92,15 @@ + <delete file="${po.build.dir}/data.pot"/> + <delete file="${po.build.dir}/plugins.raw.pot"/> </target> -- <target name="build" depends="po/josm.pot,init"> -- <gettext-merge keysFile="josm.pot" poDirectory="po"/> +- <target name="build" depends="pot,allpot"> + <target name="build.check"> + <condition property="build.run"> + <not><available file="build-timestamp"/></not> + </condition> + </target> -+ <target name="build" depends="build.check,init" if="build.run"> ++ <target name="build" depends="build.check"> <antcall target="coretrans"/> + <antcall target="datatrans"/> - <foreach param="path" target="plugintrans"> - <path> - <dirset dir="${plugin.dir}" includes="*" excludes="00_*" /> @@ -189,9 +185,9 @@ JARs and not depend on Internet connection. - </foreach> + <touch file="build-timestamp"/> </target> - <target name="singleplugintrans" depends="po/josm.pot,init"> + <target name="singleplugintrans" depends="init"> <antcall target="plugintrans"> -@@ -138,15 +138,14 @@ +@@ -141,15 +142,14 @@ </if> <delete dir="${po.build.dir}/plugin_${dir}"/> </target> @@ -211,5 +207,5 @@ JARs and not depend on Internet connection. - </delete> + <delete file="build-timestamp"/> </target> - <target name="test"> + <target name="test" depends="pot"> <mkdir dir="${i18n.build.dir}/test"/> diff --git a/debian/patches/01-bts.patch b/debian/patches/01-bts.patch index 76d2336..342b2b1 100644 --- a/debian/patches/01-bts.patch +++ b/debian/patches/01-bts.patch @@ -15,7 +15,7 @@ bug triaging. --- a/src/org/openstreetmap/josm/actions/AboutAction.java +++ b/src/org/openstreetmap/josm/actions/AboutAction.java -@@ -8,6 +8,9 @@ import java.awt.GridBagLayout; +@@ -9,6 +9,9 @@ import java.awt.Image; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -23,9 +23,9 @@ bug triaging. +import java.util.regex.Pattern; + import javax.swing.BorderFactory; + import javax.swing.ImageIcon; import javax.swing.JLabel; - import javax.swing.JOptionPane; -@@ -79,6 +82,8 @@ public class AboutAction extends JosmAct +@@ -80,6 +83,8 @@ public class AboutAction extends JosmAct "<p style='font-size:75%'></p>" + "<p>" + tr("Version {0}", version.getVersionString()) + "</p>" + "<p style='font-size:50%'></p>" + @@ -34,11 +34,12 @@ bug triaging. "<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>" + -@@ -89,7 +94,7 @@ public class AboutAction extends JosmAct - info.add(new UrlLabel(Main.getJOSMWebsite(),2), GBC.eol().fill(GBC.HORIZONTAL)); - info.add(GBC.glue(0,5), GBC.eol()); - info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(10,0,10,0)); -- info.add(BugReportExceptionHandler.getBugReportUrlLabel(Utils.strip(ShowStatusReportAction.getReportHeader())), GBC.eol().fill(GBC.HORIZONTAL)); +@@ -90,8 +95,7 @@ public class AboutAction extends JosmAct + info.add(new UrlLabel(Main.getJOSMWebsite(), 2), GBC.eol().fill(GBC.HORIZONTAL)); + info.add(GBC.glue(0, 5), GBC.eol()); + info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(10, 0, 10, 0)); +- info.add(BugReportExceptionHandler.getBugReportUrlLabel(Utils.strip(ShowStatusReportAction.getReportHeader())), +- GBC.eol().fill(GBC.HORIZONTAL)); + info.add(new UrlLabel("http://bugs.debian.org", 2), GBC.eol().fill(GBC.HORIZONTAL)); about.addTab(tr("Info"), info); @@ -75,31 +76,31 @@ bug triaging. * --- a/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java +++ b/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java -@@ -68,8 +68,8 @@ public final class BugReportExceptionHan - String[] buttonIcons = new String[] {"cancel", "bug"}; - int defaultButtonIdx = 1; - String message = tr("An unexpected exception occurred.<br>" + -- "This is always a coding error. If you are running the latest<br>" + -- "version of JOSM, please consider being kind and file a bug report." -+ "Please consider being kind and file a bug report.<br>" + -+ "See http://bugs.debian.org for a guide how to do this." - ); - // Check user is running current tested version, the error may already be fixed - int josmVersion = Version.getInstance().getVersion(); -@@ -201,24 +201,13 @@ public final class BugReportExceptionHan +@@ -62,8 +62,8 @@ public final class BugReportExceptionHan + String[] buttonIcons = new String[] {"cancel", "bug"}; + int defaultButtonIdx = 1; + String message = tr("An unexpected exception occurred.<br>" + +- "This is always a coding error. If you are running the latest<br>" + +- "version of JOSM, please consider being kind and file a bug report." ++ "Please consider being kind and file a bug report.<br>" + ++ "See http://bugs.debian.org for a guide how to do this." + ); + // Check user is running current tested version, the error may already be fixed + int josmVersion = Version.getInstance().getVersion(); +@@ -211,24 +211,13 @@ public final class BugReportExceptionHan JPanel p = new JPanel(new GridBagLayout()); p.add(new JMultilineLabel( - tr("You have encountered an error in JOSM. Before you file a bug report " + - "make sure you have updated to the latest version of JOSM here:")), - GBC.eol().fill(GridBagConstraints.HORIZONTAL)); -- p.add(new UrlLabel(Main.getJOSMWebsite(),2), GBC.eop().insets(8,0,0,0)); +- p.add(new UrlLabel(Main.getJOSMWebsite(), 2), GBC.eop().insets(8, 0, 0, 0)); + tr("Please report a bug against JOSM.")), GBC.eol()); p.add(new JMultilineLabel( - tr("You should also update your plugins. If neither of those help please " + - "file a bug report in our bugtracker using this link:")), - GBC.eol().fill(GridBagConstraints.HORIZONTAL)); -- p.add(getBugReportUrlLabel(urltext), GBC.eop().insets(8,0,0,0)); +- p.add(getBugReportUrlLabel(urltext), GBC.eop().insets(8, 0, 0, 0)); + tr("Include your steps to get to the error (as detailed as possible)!")), GBC.eol()); p.add(new JMultilineLabel( - tr("There the error information provided below should already be " + @@ -110,14 +111,14 @@ bug triaging. p.add(new JMultilineLabel( - tr("Alternatively, if that does not work you can manually fill in the information " + - "below at this URL:")), GBC.eol().fill(GridBagConstraints.HORIZONTAL)); -- p.add(new UrlLabel(Main.getJOSMWebsite()+"/newticket",2), GBC.eop().insets(8,0,0,0)); +- p.add(new UrlLabel(Main.getJOSMWebsite()+"/newticket", 2), GBC.eop().insets(8, 0, 0, 0)); + tr("Be sure to include the following information:")), GBC.eop()); // Wiki formatting for manual copy-paste text = "{{{\n"+text+"}}}"; --- a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java +++ b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java -@@ -28,6 +28,7 @@ import org.openstreetmap.josm.data.osm.D +@@ -29,6 +29,7 @@ import org.openstreetmap.josm.data.osm.D import org.openstreetmap.josm.gui.ExtendedDialog; import org.openstreetmap.josm.gui.widgets.JosmTextArea; import org.openstreetmap.josm.plugins.PluginHandler; @@ -125,11 +126,11 @@ bug triaging. import org.openstreetmap.josm.tools.PlatformHookUnixoid; import org.openstreetmap.josm.tools.Shortcut; import org.openstreetmap.josm.tools.Utils; -@@ -199,7 +200,7 @@ public final class ShowStatusReportActio +@@ -198,7 +199,7 @@ public final class ShowStatusReportActio switch (ed.showDialog().getValue()) { case 1: Utils.copyToClipboard(text.toString()); break; -- case 2: ReportBugAction.reportBug(reportHeader) ; break; +- case 2: ReportBugAction.reportBug(reportHeader); break; + case 2: OpenBrowser.displayUrl("http://bugs.debian.org"); break; } } diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch index b03e3e4..7a1ee27 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 -@@ -229,14 +229,19 @@ public final class MapPaintStyles { +@@ -230,14 +230,19 @@ public final class MapPaintStyles { } if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) { @@ -40,7 +40,7 @@ applications. This patch points josm to the shared directories. --- a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java +++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java -@@ -43,6 +43,7 @@ import org.openstreetmap.josm.gui.Extend +@@ -44,6 +44,7 @@ import org.openstreetmap.josm.gui.Extend import org.openstreetmap.josm.gui.MapView; import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor; import org.openstreetmap.josm.gui.layer.Layer; @@ -48,9 +48,9 @@ applications. This patch points josm to the shared directories. import org.openstreetmap.josm.gui.preferences.ToolbarPreferences; import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Link; import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.PresetLink; -@@ -149,8 +150,15 @@ public class TaggingPreset extends Abstr - public void setIcon(final String iconName) { - this.iconName = iconName; +@@ -160,8 +161,15 @@ public class TaggingPreset extends Abstr + return; + } File arch = TaggingPresetReader.getZipIcons(); - final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null); - ImageProvider imgProv = new ImageProvider(iconName); @@ -66,7 +66,7 @@ applications. This patch points josm to the shared directories. imgProv.setDirs(s); imgProv.setId("presets"); imgProv.setArchive(arch); -@@ -166,7 +174,7 @@ public class TaggingPreset extends Abstr +@@ -177,7 +185,7 @@ public class TaggingPreset extends Abstr } }); } else { @@ -77,7 +77,7 @@ applications. This patch points josm to the shared directories. }); --- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java +++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java -@@ -50,6 +50,7 @@ import org.openstreetmap.josm.data.osm.O +@@ -56,6 +56,7 @@ import org.openstreetmap.josm.data.osm.O import org.openstreetmap.josm.data.osm.OsmUtils; import org.openstreetmap.josm.data.osm.Tag; import org.openstreetmap.josm.data.preferences.BooleanProperty; @@ -85,7 +85,7 @@ applications. This patch points josm to the shared directories. import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField; import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority; import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList; -@@ -1521,12 +1522,22 @@ public final class TaggingPresetItems { +@@ -1570,12 +1571,22 @@ public final class TaggingPresetItems { } protected static ImageIcon loadImageIcon(String iconName, File zipIcons, Integer maxSize) { diff --git a/debian/patches/03-default_look_and_feel.patch b/debian/patches/03-default_look_and_feel.patch index 77110ca..7503362 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 -@@ -157,7 +157,7 @@ public class PlatformHookUnixoid impleme +@@ -162,7 +162,7 @@ public class PlatformHookUnixoid impleme @Override public String getDefaultStyle() { diff --git a/debian/patches/04-fix_images.patch b/debian/patches/04-fix_images.patch deleted file mode 100644 index b111d83..0000000 --- a/debian/patches/04-fix_images.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: David Paleino <da...@debian.org> -Subject: use empty icons, instead of giving errors - It should really use icons from openstreetmap-map-icons-* packages -Forwarded: not-needed - ---- - data/defaultpresets.xml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- josm.orig/data/defaultpresets.xml -+++ josm/data/defaultpresets.xml -@@ -3243,7 +3243,7 @@ Note that for a match, at least one posi - <key key="amenity" value="theatre" /> - <text key="name" text="Name" /> - </item> -- <item name="Library" icon="styles/standard/shop/rental/library.png" type="node,closedway,relation"> -+ <item name="Library" icon="presets/empty.png" type="node,closedway,relation"> - <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library" - de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=library" - fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" -@@ -3562,7 +3562,7 @@ Note that for a match, at least one posi - <space /> - </item> - <separator/> -- <item name="Veterinary" icon="styles/standard/health/veterinary.png" type="node,closedway"> -+ <item name="Veterinary" icon="presets/empty.png" type="node,closedway"> - <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary" - da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=veterinary" - fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" diff --git a/debian/patches/04-use_system_jmapviewer.patch b/debian/patches/04-use_system_jmapviewer.patch index 179b2ef..1afd126 100644 --- a/debian/patches/04-use_system_jmapviewer.patch +++ b/debian/patches/04-use_system_jmapviewer.patch @@ -10,7 +10,7 @@ Forwarded: no --- a/build.xml +++ b/build.xml -@@ -139,7 +139,6 @@ Debian-Release: ${debian.version} +@@ -142,7 +142,6 @@ Debian-Release: ${debian.version} <zipfileset dir="images" prefix="images"/> <zipfileset dir="data" prefix="data"/> <zipfileset dir="styles" prefix="styles"/> diff --git a/debian/patches/05-fix_version.patch b/debian/patches/05-fix_version.patch index 0562e59..8f1b425 100644 --- a/debian/patches/05-fix_version.patch +++ b/debian/patches/05-fix_version.patch @@ -10,7 +10,7 @@ Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -128,7 +128,7 @@ Debian-Release: ${debian.version} +@@ -131,7 +131,7 @@ Debian-Release: ${debian.version} <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar --> <manifest> <attribute name="Main-class" value="JOSM"/> diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch index a18ef77..620b36d 100644 --- a/debian/patches/06-move_data_out_of_jar.patch +++ b/debian/patches/06-move_data_out_of_jar.patch @@ -13,7 +13,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608 --- a/src/org/openstreetmap/josm/tools/I18n.java +++ b/src/org/openstreetmap/josm/tools/I18n.java -@@ -7,6 +7,7 @@ import java.io.FileInputStream; +@@ -8,6 +8,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -21,13 +21,13 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608 import java.nio.charset.StandardCharsets; import java.text.MessageFormat; import java.util.ArrayList; -@@ -348,7 +349,11 @@ public final class I18n { +@@ -352,7 +353,11 @@ public final class I18n { } private static URL getTranslationFile(String lang) { -- return Main.class.getResource("/data/"+lang.replace("@","-")+".lang"); +- return Main.class.getResource("/data/"+lang.replace("@", "-")+".lang"); + try { -+ return new URL("file:///usr/share/josm/data/"+lang.replace("@","-")+".lang"); ++ return Main.class.getResource("/data/"+lang.replace("@", "-")+".lang"); + } catch (MalformedURLException ex) { + return null; + } @@ -36,7 +36,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608 /** --- a/src/org/openstreetmap/josm/io/CachedFile.java +++ b/src/org/openstreetmap/josm/io/CachedFile.java -@@ -172,11 +172,17 @@ public class CachedFile { +@@ -188,11 +188,17 @@ public class CachedFile { File file = getFile(); if (file == null) { if (name.startsWith("resource://")) { @@ -61,7 +61,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608 } --- a/build.xml +++ b/build.xml -@@ -136,9 +136,9 @@ Debian-Release: ${debian.version} +@@ -139,9 +139,9 @@ Debian-Release: ${debian.version} <attribute name="Debian-Release" value="${debian.version}"/> <attribute name="Class-Path" value="${classpathprop}"/> </manifest> diff --git a/debian/patches/07-use_system_fonts.patch b/debian/patches/07-use_system_fonts.patch index 4efe381..1e2412f 100644 --- a/debian/patches/07-use_system_fonts.patch +++ b/debian/patches/07-use_system_fonts.patch @@ -9,12 +9,12 @@ Forwarded: not-needed --- a/src/org/openstreetmap/josm/tools/FontsManager.java +++ b/src/org/openstreetmap/josm/tools/FontsManager.java -@@ -36,7 +36,7 @@ public class 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; try (InputStream i = new CachedFile(url).getInputStream()) { - Font f = Font.createFont(Font.TRUETYPE_FONT, i); - if (f == null) { + ge.registerFont(Font.createFont(Font.TRUETYPE_FONT, i)); + } catch (IOException | FontFormatException ex) { diff --git a/debian/patches/08-disable_gettext-merge.patch b/debian/patches/08-disable_gettext-merge.patch deleted file mode 100644 index 4192782..0000000 --- a/debian/patches/08-disable_gettext-merge.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: David Paleino <da...@debian.org> -Subject: temporarily disable gettext-merge tasks - They're really time consuming, and during development I prefer - enabling this patch. -Origin: vendor -Forwarded: not-needed - ---- - i18n/build.xml | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- josm.orig/i18n/build.xml -+++ josm/i18n/build.xml -@@ -96,7 +96,9 @@ - </antcall> - </target> - <target name="buildcore" depends="po/josm.pot,init"> -+<!-- - <gettext-merge keysFile="josm.pot" poDirectory="po"/> -+--> - <antcall target="coretrans"/> - </target> - <target name="coretrans"> -@@ -110,7 +112,9 @@ - <copy todir="${po.build.dir}/core"> - <fileset dir="po"/> - </copy> -+<!-- - <gettext-merge keysFile="josm.pot" poDirectory="${po.build.dir}/core"/> -+--> - <exec executable="perl"> - <arg line="i18n.pl ${i18n.install.dir}/ ${po.build.dir}/core/*.po"/> - </exec> -@@ -131,7 +135,9 @@ - <copy todir="${po.build.dir}/plugin_${dir}"> - <fileset dir="po"/> - </copy> -+<!-- - <gettext-merge keysFile="josm.pot" poDirectory="${po.build.dir}/plugin_${dir}"/> -+--> - <exec executable="perl"> - <arg line="i18n.pl ${plugin.dir}/${dir}/data/ ${po.build.dir}/plugin_${dir}/*.po"/> - </exec> diff --git a/debian/patches/08-use_external_json_library.patch b/debian/patches/08-use_external_json_library.patch deleted file mode 100644 index d860253..0000000 --- a/debian/patches/08-use_external_json_library.patch +++ /dev/null @@ -1,145 +0,0 @@ -From: David Paleino <da...@debian.org> -Subject: depend on external free version of the JSON library -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=740890 -Origin: vendor -Forwarded: no - ---- - CONTRIBUTION | 4 -- - build.xml | 1 - src/org/openstreetmap/josm/io/GeoJSONExporter.java | 8 ++++- - src/org/openstreetmap/josm/io/GeoJSONWriter.java | 31 +++++++++++++-------- - 4 files changed, 28 insertions(+), 16 deletions(-) - ---- josm.orig/build.xml -+++ josm/build.xml -@@ -31,6 +31,7 @@ - <include name="ant.jar"/> - <include name="commons-codec.jar"/> - <include name="jmapviewer.jar"/> -+ <include name="json.jar"/> - </fileset> - </path> - <property name="classpathprop-colon" refid="classpath"/> ---- josm.orig/CONTRIBUTION -+++ josm/CONTRIBUTION -@@ -53,10 +53,6 @@ is from Stuart D. Gathman and licensed w - The Ellipsoid code (http://www.i3s.unice.fr/~johan/gps/) - is from Johan Montagnat and licensed with GPL. - --The JSON code (https://github.com/douglascrockford/JSON-java) --is from Douglas Crockford and licensed as follows: --"The Software shall be used for Good, not Evil." -- - The opening hour validation uses code from opening_hour.js - (https://github.com/ypid/opening_hours.js) which is licensed - with the New (2-clause) BSD license. ---- josm.orig/src/org/openstreetmap/josm/io/GeoJSONWriter.java -+++ josm/src/org/openstreetmap/josm/io/GeoJSONWriter.java -@@ -5,6 +5,7 @@ import java.util.Iterator; - import java.util.Map; - import java.util.Map.Entry; - -+import org.json.JSONException; - import org.json.JSONStringer; - import org.openstreetmap.josm.data.Bounds; - import org.openstreetmap.josm.data.coor.LatLon; -@@ -26,7 +27,7 @@ public class GeoJSONWriter implements Vi - this.layer = layer; - } - -- public String write() { -+ public String write() throws JSONException { - out = new JSONStringer(); - out.object().key("type").value("FeatureCollection"); - out.key("generator").value("JOSM"); -@@ -44,17 +45,25 @@ public class GeoJSONWriter implements Vi - - @Override - public void visit(Node n) { -- out.key("type").value("Point").key("coordinates"); -- appendCoord(n.getCoor()); -+ try { -+ out.key("type").value("Point").key("coordinates"); -+ appendCoord(n.getCoor()); -+ } catch (JSONException ex) { -+ throw new RuntimeException(ex); -+ } - } - - @Override - public void visit(Way w) { -- out.key("type").value("LineString").key("coordinates").array(); -- for (Node n : w.getNodes()) { -- appendCoord(n.getCoor()); -+ try { -+ out.key("type").value("LineString").key("coordinates").array(); -+ for (Node n : w.getNodes()) { -+ appendCoord(n.getCoor()); -+ } -+ out.endArray(); -+ } catch (JSONException ex) { -+ throw new RuntimeException(ex); - } -- out.endArray(); - } - - @Override -@@ -65,7 +74,7 @@ public class GeoJSONWriter implements Vi - public void visit(Changeset cs) { - } - -- protected void appendPrimitive(OsmPrimitive p) { -+ protected void appendPrimitive(OsmPrimitive p) throws JSONException { - if (p.isIncomplete()) { - return; - } else if (skipEmptyNodes && p instanceof Node && p.getKeys().isEmpty()) { -@@ -85,13 +94,13 @@ public class GeoJSONWriter implements Vi - out.endObject(); - } - -- protected void appendCoord(LatLon c) { -+ protected void appendCoord(LatLon c) throws JSONException { - if (c != null) { - out.array().value(c.lon()).value(c.lat()).endArray(); - } - } - -- protected void appendLayerBounds() { -+ protected void appendLayerBounds() throws JSONException { - Iterator<Bounds> it = layer.data.getDataSourceBounds().iterator(); - if (it.hasNext()) { - Bounds b = new Bounds(it.next()); -@@ -102,7 +111,7 @@ public class GeoJSONWriter implements Vi - } - } - -- protected void appendBounds(Bounds b) { -+ protected void appendBounds(Bounds b) throws JSONException { - if (b != null) { - out.key("bbox").array() - .value(b.getMinLon()).value(b.getMinLat()) ---- josm.orig/src/org/openstreetmap/josm/io/GeoJSONExporter.java -+++ josm/src/org/openstreetmap/josm/io/GeoJSONExporter.java -@@ -10,6 +10,7 @@ import java.io.IOException; - import java.io.OutputStreamWriter; - import java.io.Writer; - -+import org.json.JSONException; - import org.openstreetmap.josm.actions.ExtensionFileFilter; - import org.openstreetmap.josm.gui.layer.Layer; - import org.openstreetmap.josm.gui.layer.OsmDataLayer; -@@ -27,7 +28,12 @@ public class GeoJSONExporter extends Fil - @Override - public void exportData(File file, Layer layer) throws IOException { - if (layer instanceof OsmDataLayer) { -- String json = new GeoJSONWriter((OsmDataLayer) layer).write(); -+ String json = ""; -+ try { -+ json = new GeoJSONWriter((OsmDataLayer) layer).write(); -+ } catch (JSONException ex) { -+ throw new RuntimeException(ex); -+ } - Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), Utils.UTF_8)); - try { - out.write(json); diff --git a/debian/patches/100-fix_SlippyMapBBoxChooser.patch b/debian/patches/100-fix_SlippyMapBBoxChooser.patch deleted file mode 100644 index c997681..0000000 --- a/debian/patches/100-fix_SlippyMapBBoxChooser.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: David Paleino <da...@debian.org> -Subject: fix code used in SlippyMapBBoxChooser -Origin: vendor -Forwarded: no - ---- - src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- josm.orig/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java -+++ josm/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java -@@ -27,9 +27,9 @@ public class AttributionSupport { - public static final Font ATTR_FONT = new Font("Arial", Font.PLAIN, 10); - public static final Font ATTR_LINK_FONT; - -- protected Rectangle attrTextBounds = null; -- protected Rectangle attrToUBounds = null; -- protected Rectangle attrImageBounds = null; -+ public Rectangle attrTextBounds = null; -+ public Rectangle attrToUBounds = null; -+ public Rectangle attrImageBounds = null; - - static { - HashMap<TextAttribute, Integer> aUnderline = new HashMap<TextAttribute, Integer>(); diff --git a/debian/patches/series b/debian/patches/series index 270b848..cc73016 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,8 +4,5 @@ 03-default_look_and_feel.patch 04-use_system_jmapviewer.patch 05-fix_version.patch -#100-fix_SlippyMapBBoxChooser.patch 06-move_data_out_of_jar.patch -#08-use_external_json_library.patch 07-use_system_fonts.patch -#08-disable_gettext-merge.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