This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm.
commit 2df1cf7c1a21dd14a16caf1e9e09072ea341aeff Author: Bas Couwenberg <[email protected]> Date: Sun Nov 26 17:44:17 2017 +0100 Drop 'Update multipolygon' patch, included upstream. Refresh remaining patches. --- debian/changelog | 2 ++ debian/patches/00-build.patch | 30 +++++++++++----------- 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/series | 1 - ...pdate-multipolygon-action-no-longer-works.patch | 23 ----------------- 7 files changed, 20 insertions(+), 42 deletions(-) diff --git a/debian/changelog b/debian/changelog index 739b0ca..2cf8004 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ josm (0.0.svn13170+dfsg-1) UNRELEASED; urgency=medium * New tested snapshot. * Update copyright holders for metadata-extractor sources. + * Drop 'Update multipolygon' patch, included upstream. + Refresh remaining patches. -- Bas Couwenberg <[email protected]> Sun, 26 Nov 2017 17:34:31 +0100 diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch index d3ca013..cd55231 100644 --- a/debian/patches/00-build.patch +++ b/debian/patches/00-build.patch @@ -19,9 +19,9 @@ Forwarded: not-needed <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant.jar"/> <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/> <property name="dist-optimized.jar" location="${dist.dir}/josm-custom-optimized.jar"/> -@@ -41,6 +42,19 @@ +@@ -44,6 +45,19 @@ <condition property="isJava9"> - <matches string="${ant.java.version}" pattern="(1.)?9" /> + <matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" /> </condition> + <!-- Java classpath addition (all jar files to compile tests with this) --> + <path id="classpath"> @@ -39,7 +39,7 @@ Forwarded: not-needed <path id="test.classpath"> <fileset dir="${test.dir}/lib"> <include name="**/*.jar"/> -@@ -103,10 +117,9 @@ +@@ -106,10 +120,9 @@ <!-- ** Creates the REVISION file to be included in the distribution --> @@ -52,7 +52,7 @@ Forwarded: not-needed <tstamp> <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/> </tstamp> -@@ -117,8 +130,10 @@ +@@ -120,8 +133,10 @@ <echo file="${revision.dir}/REVISION"> # automatically generated by JOSM build.xml - do not edit Revision: ${version.entry.commit.revision} @@ -64,7 +64,7 @@ Forwarded: not-needed </echo> </target> <!-- -@@ -138,7 +153,7 @@ Build-Date: ${build.tstamp} +@@ -141,7 +156,7 @@ Build-Date: ${build.tstamp} <copy file="README" todir="${build.dir}"/> <copy file="LICENSE" todir="${build.dir}"/> <!-- create josm-custom.jar --> @@ -73,7 +73,7 @@ Forwarded: not-needed <jar destfile="${dist.jar}" basedir="${build.dir}" level="${clevel}"> <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar --> <manifest> -@@ -148,6 +163,8 @@ Build-Date: ${build.tstamp} +@@ -151,6 +166,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"/> @@ -82,7 +82,7 @@ Forwarded: not-needed <!-- Java 9 stuff. Entries are safely ignored by Java 8 --> <attribute name="Add-Exports" value="java.base/sun.security.util java.base/sun.security.x509 java.desktop/com.apple.eawt java.desktop/com.sun.imageio.spi javafx.graphics/com.sun.javafx.application jdk.deploy/com.sun.deploy.config" /> <attribute name="Add-Opens" value="java.base/java.lang java.base/java.nio java.base/jdk.internal.loader java.base/jdk.internal.ref java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" /> -@@ -222,43 +239,21 @@ Build-Date: ${build.tstamp} +@@ -225,43 +242,21 @@ Build-Date: ${build.tstamp} </target> <target name="javacc" depends="init" unless="javacc.notRequired"> <mkdir dir="${mapcss.dir}/parsergen"/> @@ -129,7 +129,7 @@ Forwarded: not-needed <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"/> -@@ -279,21 +274,15 @@ Build-Date: ${build.tstamp} +@@ -282,21 +277,15 @@ 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/**"/> @@ -154,7 +154,7 @@ Forwarded: not-needed <compilerarg value="-Xlint:cast"/> <compilerarg value="-Xlint:deprecation"/> <compilerarg value="-Xlint:dep-ann"/> -@@ -307,18 +296,14 @@ Build-Date: ${build.tstamp} +@@ -310,18 +299,14 @@ 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"/> @@ -174,7 +174,7 @@ Forwarded: not-needed <compilerarg value="-Xlint:cast"/> <compilerarg value="-Xlint:deprecation"/> <compilerarg value="-Xlint:dep-ann"/> -@@ -332,12 +317,6 @@ Build-Date: ${build.tstamp} +@@ -335,12 +320,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"/> @@ -183,11 +183,11 @@ Forwarded: not-needed - <compilerarg value="-Xep:FutureReturnValueIgnored:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/> - <compilerarg value="-Xep:FloatingPointLiteralPrecision:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/> - <compilerarg value="-Xep:ShortCircuitBoolean:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/> -- <compilerarg value="-Xep:LiteralClassName:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/> +- <compilerarg value="-Xep:JdkObsolete:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/> <compilerarg line="-Xmaxwarns 1000"/> <exclude name="org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java" if:set="noJavaFX"/> </javac> -@@ -352,6 +331,7 @@ Build-Date: ${build.tstamp} +@@ -355,6 +334,7 @@ Build-Date: ${build.tstamp} </uptodate> <mkdir dir="${build.dir}"/> <mkdir dir="${dist.dir}"/> @@ -195,7 +195,7 @@ Forwarded: not-needed </target> <target name="javadoc" depends="init-properties"> <javadoc destdir="javadoc" -@@ -384,6 +364,7 @@ Build-Date: ${build.tstamp} +@@ -387,6 +367,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}"/> @@ -203,7 +203,7 @@ Forwarded: not-needed </target> <macrodef name="init-test-preferences"> <attribute name="testfamily"/> -@@ -886,6 +867,7 @@ Build-Date: ${build.tstamp} +@@ -888,6 +869,7 @@ Build-Date: ${build.tstamp} <pathelement path="${base.dir}"/> <pathelement path="${proj-classpath}"/> <pathelement path="${proj-build.dir}"/> @@ -221,7 +221,7 @@ Forwarded: not-needed + <property name="josm.build.dir" value=".."/> <property name="josm.presets" value="${josm.build.dir}/data/defaultpresets.xml"/> <property name="plugin.dir" value="../plugins"/> - <property name="maps.srcfile" value="http://josm.openstreetmap.de/maps"/> + <property name="maps.srcfile" value="https://josm.openstreetmap.de/maps"/> @@ -13,8 +13,8 @@ <property name="i18n_data.install.dir" value="${josm.build.dir}/data_nodist/trans"/> <property name="po.build.dir" value="${i18n.build.dir}"/> diff --git a/debian/patches/04-use_system_jmapviewer.patch b/debian/patches/04-use_system_jmapviewer.patch index d22dc80..925d989 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 -@@ -173,7 +173,6 @@ Debian-Release: ${debian.version} +@@ -176,7 +176,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 8d16538..6c4ac07 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 -@@ -158,7 +158,7 @@ Debian-Release: ${debian.version} +@@ -161,7 +161,7 @@ Debian-Release: ${debian.version} <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar --> <manifest> <attribute name="Main-class" value="org.openstreetmap.josm.gui.MainApplication"/> diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch index 15f3b5c..8deb67e 100644 --- a/debian/patches/06-move_data_out_of_jar.patch +++ b/debian/patches/06-move_data_out_of_jar.patch @@ -6,7 +6,7 @@ Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -170,9 +170,6 @@ Debian-Release: ${debian.version} +@@ -173,9 +173,6 @@ Debian-Release: ${debian.version} <attribute name="Add-Opens" value="java.base/java.lang java.base/java.nio java.base/jdk.internal.loader java.base/jdk.internal.ref java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" /> </manifest> <service type="java.text.spi.DecimalFormatSymbolsProvider" provider="org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider" /> diff --git a/debian/patches/series b/debian/patches/series index ec5b5cb..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 -svn-r13067-Update-multipolygon-action-no-longer-works.patch diff --git a/debian/patches/svn-r13067-Update-multipolygon-action-no-longer-works.patch b/debian/patches/svn-r13067-Update-multipolygon-action-no-longer-works.patch deleted file mode 100644 index 72e2226..0000000 --- a/debian/patches/svn-r13067-Update-multipolygon-action-no-longer-works.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: fix #15507 - Update multipolygon action no longer works (regression from r12726) -Author: Don-vip -Origin: https://josm.openstreetmap.de/changeset/13067/josm -Bug: https://josm.openstreetmap.de/ticket/15507 - ---- a/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java -+++ b/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java -@@ -449,8 +449,13 @@ public class CreateMultipolygonAction ex - fixed = true; - } - } -- if (fixed && !relation.isNew()) -- commands.add(new ChangeCommand(relation, r2)); -+ if (fixed && !relation.isNew()) { -+ DataSet ds = relation.getDataSet(); -+ if (ds == null) { -+ ds = MainApplication.getLayerManager().getEditDataSet(); -+ } -+ commands.add(new ChangeCommand(ds, relation, r2)); -+ } - } - - return commands; -- 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
