This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm.
commit 76468f459d3af90ae852daf9996e8800e241a4a3 Author: Bas Couwenberg <[email protected]> Date: Tue Sep 6 10:24:49 2016 +0200 Drop svn-r10789-fix-two-svg-files.patch, included upstream. Refresh remaining patches. --- debian/changelog | 2 + debian/patches/00-build.patch | 52 ++++++++++++----------- debian/patches/01-bts.patch | 14 +++--- debian/patches/02-elemstyles.patch | 8 ++-- debian/patches/04-use_system_jmapviewer.patch | 2 +- debian/patches/05-fix_version.patch | 2 +- debian/patches/06-move_data_out_of_jar.patch | 2 +- debian/patches/08-use_noto_font.patch | 2 +- debian/patches/series | 1 - debian/patches/svn-r10789-fix-two-svg-files.patch | 26 ------------ 10 files changed, 45 insertions(+), 66 deletions(-) diff --git a/debian/changelog b/debian/changelog index 22ccb16..9907ce5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ josm (0.0.svn10966+dfsg-1) UNRELEASED; urgency=medium * Update copyright file, changes: - Update copyright for src/com/drew/* - Add license & copyright for japi-compliance-checker.pl + * Drop svn-r10789-fix-two-svg-files.patch, included upstream. + Refresh remaining patches. -- Bas Couwenberg <[email protected]> Tue, 06 Sep 2016 09:34:13 +0200 diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch index d8e5841..ec615c1 100644 --- a/debian/patches/00-build.patch +++ b/debian/patches/00-build.patch @@ -9,19 +9,17 @@ Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -24,9 +24,8 @@ +@@ -24,7 +24,8 @@ <property name="mapcss.dir" location="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss"/> <property name="proj-build.dir" location="${base.dir}/build2"/> <property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/> - <property name="groovy.jar" location="${base.dir}/tools/groovy-all-2.4.7.jar"/> -- <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.11.jar"/> -- <property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" /> + <property name="groovy.jar" location="/usr/share/java/groovy-all.jar"/> + <property name="antcontrib.jar" value="/usr/share/java/ant-contrib.jar"/> + <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.12.jar"/> + <property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" /> <!-- build parameter: compression level (ant -Dclevel=N) - N ranges from 0 (no compression) to 9 (maximum compression) - default: 9 --> -@@ -37,6 +36,19 @@ +@@ -37,6 +38,19 @@ <condition property="isJava9"> <equals arg1="${ant.java.version}" arg2="1.9" /> </condition> @@ -41,7 +39,7 @@ Forwarded: not-needed <path id="test.classpath"> <fileset dir="${test.dir}/lib"> <include name="**/*.jar"/> -@@ -92,10 +104,9 @@ +@@ -92,10 +106,9 @@ <!-- ** Creates the REVISION file to be included in the distribution --> @@ -54,7 +52,7 @@ Forwarded: not-needed <tstamp> <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/> </tstamp> -@@ -106,8 +117,10 @@ +@@ -106,8 +119,10 @@ <echo file="${revision.dir}/REVISION"> # automatically generated by JOSM build.xml - do not edit Revision: ${version.entry.commit.revision} @@ -66,7 +64,7 @@ Forwarded: not-needed </echo> </target> <!-- -@@ -127,7 +140,7 @@ Build-Date: ${build.tstamp} +@@ -127,7 +142,7 @@ Build-Date: ${build.tstamp} <copy file="README" todir="build"/> <copy file="LICENSE" todir="build"/> <!-- create josm-custom.jar --> @@ -75,7 +73,7 @@ Forwarded: not-needed <jar destfile="${dist.dir}/josm-custom.jar" basedir="${build.dir}" level="${clevel}"> <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar --> <manifest> -@@ -137,6 +150,8 @@ Build-Date: ${build.tstamp} +@@ -137,6 +152,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"/> @@ -84,7 +82,7 @@ Forwarded: not-needed </manifest> <zipfileset dir="images" prefix="images"/> <zipfileset dir="data" prefix="data"/> -@@ -207,10 +222,7 @@ Build-Date: ${build.tstamp} +@@ -207,10 +224,7 @@ Build-Date: ${build.tstamp} </target> <target name="javacc" depends="init" unless="javacc.notRequired"> <mkdir dir="${mapcss.dir}/parsergen"/> @@ -96,7 +94,7 @@ Forwarded: not-needed <arg value="-DEBUG_PARSER=false"/> <arg value="-DEBUG_TOKEN_MANAGER=false"/> <arg value="-JDK_VERSION=1.8"/> -@@ -221,36 +233,21 @@ Build-Date: ${build.tstamp} +@@ -221,22 +235,10 @@ Build-Date: ${build.tstamp} </target> <target name="compile" depends="init,javacc"> <!-- COTS --> @@ -105,18 +103,24 @@ Forwarded: not-needed destdir="build" target="1.8" source="1.8" 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/bzip2/BZip2Utils.java"/> - <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"/> +- <exclude name="org/apache/commons/compress/compressors/CompressorException.java"/> +- <exclude name="org/apache/commons/compress/compressors/FileNameUtil.java"/> - <exclude name="org/apache/commons/compress/compressors/deflate/**"/> - <exclude name="org/apache/commons/compress/compressors/gzip/**"/> - <exclude name="org/apache/commons/compress/compressors/lzw/**"/> - <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/JCS.java"/> + <exclude name="org/apache/commons/jcs/access/GroupCacheAccess.java"/> + <exclude name="org/apache/commons/jcs/access/PartitionedCacheAccess.java"/> +@@ -257,19 +259,13 @@ Build-Date: ${build.tstamp} + <exclude name="org/apache/commons/jcs/utils/net/**"/> + <exclude name="org/apache/commons/jcs/utils/props/**"/> <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"/> @@ -128,8 +132,8 @@ Forwarded: not-needed + <ant dir="i18n" /> <!-- JMapViewer --> - <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}" -+ <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/**" ++ <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath" + excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,JOSM.java,gnu/**" destdir="build" target="1.8" source="1.8" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8"> - <compilerclasspath> - <pathelement location="${error_prone_ant.jar}"/> @@ -137,7 +141,7 @@ Forwarded: not-needed <compilerarg value="-Xlint:cast"/> <compilerarg value="-Xlint:deprecation"/> <compilerarg value="-Xlint:dep-ann"/> -@@ -264,16 +261,12 @@ Build-Date: ${build.tstamp} +@@ -283,16 +279,12 @@ Build-Date: ${build.tstamp} <compilerarg value="-Xlint:unchecked"/> <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 --> <compilerarg value="-XDignore.symbol.file"/> @@ -146,8 +150,8 @@ Forwarded: not-needed </javac> <!-- JOSM --> - <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}" -+ <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath" - excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java" ++ <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath" + excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**" destdir="build" target="1.8" source="1.8" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8"> - <compilerclasspath> - <pathelement location="${error_prone_ant.jar}"/> @@ -155,7 +159,7 @@ Forwarded: not-needed <compilerarg value="-Xlint:cast"/> <compilerarg value="-Xlint:deprecation"/> <compilerarg value="-Xlint:dep-ann"/> -@@ -287,7 +280,6 @@ Build-Date: ${build.tstamp} +@@ -306,7 +298,6 @@ Build-Date: ${build.tstamp} <compilerarg value="-Xlint:unchecked"/> <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 --> <compilerarg value="-XDignore.symbol.file"/> @@ -163,7 +167,7 @@ Forwarded: not-needed <compilerarg line="-Xmaxwarns 1000"/> </javac> -@@ -301,6 +293,7 @@ Build-Date: ${build.tstamp} +@@ -320,6 +311,7 @@ Build-Date: ${build.tstamp} </uptodate> <mkdir dir="${build.dir}"/> <mkdir dir="${dist.dir}"/> @@ -171,7 +175,7 @@ Forwarded: not-needed </target> <target name="javadoc" depends="init-properties"> <javadoc destdir="javadoc" -@@ -326,6 +319,7 @@ Build-Date: ${build.tstamp} +@@ -345,6 +337,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}"/> @@ -179,7 +183,7 @@ Forwarded: not-needed </target> <macrodef name="init-test-preferences"> <attribute name="testfamily"/> -@@ -731,6 +725,7 @@ Build-Date: ${build.tstamp} +@@ -767,6 +760,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 7437a05..93b4508 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 -@@ -32,6 +32,7 @@ import org.openstreetmap.josm.gui.prefer - import org.openstreetmap.josm.gui.preferences.validator.ValidatorTagCheckerRulesPreference; +@@ -35,6 +35,7 @@ import org.openstreetmap.josm.gui.prefer + import org.openstreetmap.josm.gui.util.GuiHelper; 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.Utils; -@@ -273,7 +274,7 @@ public final class ShowStatusReportActio +@@ -294,7 +295,7 @@ public final class ShowStatusReportActio switch (ed.showDialog().getValue()) { case 1: ta.copyToClippboard(); break; @@ -85,7 +85,7 @@ Forwarded: not-needed } --- a/src/org/openstreetmap/josm/tools/bugreport/BugReportDialog.java +++ b/src/org/openstreetmap/josm/tools/bugreport/BugReportDialog.java -@@ -86,7 +86,8 @@ public class BugReportDialog extends JDi +@@ -90,7 +90,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 +95,7 @@ Forwarded: not-needed Icon icon = UIManager.getIcon("OptionPane.errorIcon"); JPanel panel = new JPanel(new GridBagLayout()); -@@ -104,7 +105,7 @@ public class BugReportDialog extends JDi +@@ -108,7 +109,7 @@ public class BugReportDialog extends JDi panel.add(textPanel, GBC.eop().fill()); panel.add(new JLabel(tr("Manually report at:")), GBC.std()); @@ -104,7 +104,7 @@ Forwarded: not-needed JButton copy = new JButton("Copy to clipboard"); copy.addActionListener(e -> textPanel.copyToClippboard()); panel.add(copy, GBC.eol().anchor(GBC.EAST)); -@@ -124,8 +125,7 @@ public class BugReportDialog extends JDi +@@ -128,8 +129,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 +114,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)); -@@ -135,9 +135,6 @@ public class BugReportDialog extends JDi +@@ -139,9 +139,6 @@ public class BugReportDialog extends JDi panel.add(new BugReportSettingsPanel(report), GBC.eop().fill(GBC.HORIZONTAL)); } diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch index 74b108f..7a30338 100644 --- a/debian/patches/02-elemstyles.patch +++ b/debian/patches/02-elemstyles.patch @@ -7,7 +7,7 @@ Forwarded: not-needed --- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java +++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java -@@ -241,11 +241,19 @@ public final class MapPaintStyles { +@@ -254,11 +254,19 @@ public final class MapPaintStyles { if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) { /* don't prefix icon path, as it should be generic */ dirs.add("resource://images/"); @@ -36,8 +36,8 @@ Forwarded: not-needed +import org.openstreetmap.josm.gui.mappaint.MapPaintStyles; import org.openstreetmap.josm.gui.preferences.ToolbarPreferences; import org.openstreetmap.josm.gui.tagging.presets.items.Key; - import org.openstreetmap.josm.gui.tagging.presets.items.Label; -@@ -196,8 +197,15 @@ public class TaggingPreset extends Abstr + import org.openstreetmap.josm.gui.tagging.presets.items.Link; +@@ -205,8 +206,15 @@ public class TaggingPreset extends Abstr return; } File arch = TaggingPresetReader.getZipIcons(); @@ -55,7 +55,7 @@ Forwarded: not-needed imgProv.setDirs(s); imgProv.setId("presets"); imgProv.setArchive(arch); -@@ -206,7 +214,7 @@ public class TaggingPreset extends Abstr +@@ -215,7 +223,7 @@ public class TaggingPreset extends Abstr if (result != null) { GuiHelper.runInEDT(() -> result.attachImageIcon(this)); } else { diff --git a/debian/patches/04-use_system_jmapviewer.patch b/debian/patches/04-use_system_jmapviewer.patch index 9f2b131..8b6b670 100644 --- a/debian/patches/04-use_system_jmapviewer.patch +++ b/debian/patches/04-use_system_jmapviewer.patch @@ -5,7 +5,7 @@ Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -156,7 +156,6 @@ Debian-Release: ${debian.version} +@@ -158,7 +158,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 8079694..1a1f10a 100644 --- a/debian/patches/05-fix_version.patch +++ b/debian/patches/05-fix_version.patch @@ -8,7 +8,7 @@ Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -145,7 +145,7 @@ Debian-Release: ${debian.version} +@@ -147,7 +147,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 a8e1cb1..70fac82 100644 --- a/debian/patches/06-move_data_out_of_jar.patch +++ b/debian/patches/06-move_data_out_of_jar.patch @@ -54,7 +54,7 @@ Forwarded: not-needed } --- a/build.xml +++ b/build.xml -@@ -153,9 +153,9 @@ Debian-Release: ${debian.version} +@@ -155,9 +155,9 @@ Debian-Release: ${debian.version} <attribute name="Debian-Release" value="${debian.version}"/> <attribute name="Class-Path" value="${classpathprop}"/> </manifest> diff --git a/debian/patches/08-use_noto_font.patch b/debian/patches/08-use_noto_font.patch index c61deb6..63ec8c8 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 -@@ -1551,7 +1551,7 @@ public class StyledMapRenderer extends A +@@ -1549,7 +1549,7 @@ public class StyledMapRenderer extends A showNames = paintSettings.getShowNamesDistance() > circum; showIcons = paintSettings.getShowIconsDistance() > circum; isOutlineOnly = paintSettings.isOutlineOnly(); diff --git a/debian/patches/series b/debian/patches/series index 1cf01c9..419e6a3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,4 +7,3 @@ 06-move_data_out_of_jar.patch 07-use_system_fonts.patch 08-use_noto_font.patch -svn-r10789-fix-two-svg-files.patch diff --git a/debian/patches/svn-r10789-fix-two-svg-files.patch b/debian/patches/svn-r10789-fix-two-svg-files.patch deleted file mode 100644 index 7f66c98..0000000 --- a/debian/patches/svn-r10789-fix-two-svg-files.patch +++ /dev/null @@ -1,26 +0,0 @@ -Description: Fix two svg files. -Origin: https://josm.openstreetmap.de/changeset/10789/josm -Bug: https://josm.openstreetmap.de/ticket/13291 - ---- a/images/presets/shop/diy_store.svg -+++ b/images/presets/shop/diy_store.svg -@@ -120,7 +120,7 @@ - style="stop-color:#000000;stop-opacity:0.49803922;" /> - <stop - id="stop8972" -- offset="0.50000000" -+ offset="0.7" - style="stop-color:#000000;stop-opacity:0.24705882;" /> - <stop - id="stop8966" ---- a/images/presets/sport/volleyball.svg -+++ b/images/presets/sport/volleyball.svg -@@ -78,7 +78,7 @@ - style="stop-color:#002723;stop-opacity:1.0000000;" /> - <stop - id="stop1883" -- offset="1.0000000" -+ offset="0.98" - style="stop-color:#000000;stop-opacity:0.49803922;" /> - <stop - id="stop1881" -- 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
