This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm.
commit 05d3d219853d3745839425b2a2de6e48145b9839 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Oct 30 12:00:50 2015 +0100 Drop patch applied upstream, refresh remaining patches. --- debian/changelog | 1 + debian/patches/00-build.patch | 22 +++++++-------- debian/patches/02-elemstyles.patch | 39 +++++++++++++-------------- debian/patches/03-default_look_and_feel.patch | 2 +- debian/patches/04-use_system_jmapviewer.patch | 2 +- debian/patches/05-fix_version.patch | 2 +- debian/patches/06-move_data_out_of_jar.patch | 6 ++--- debian/patches/08-josm-desktop-fixes.patch | 39 --------------------------- debian/patches/series | 1 - 9 files changed, 37 insertions(+), 77 deletions(-) diff --git a/debian/changelog b/debian/changelog index d2dccc5..f8b887b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ josm (0.0.svn8964-1) UNRELEASED; urgency=medium * New tested snapshot. + * Drop patch applied upstream, refresh remaining patches. -- Bas Couwenberg <sebas...@debian.org> Fri, 30 Oct 2015 11:15:14 +0100 diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch index b0e91be..161576e 100644 --- a/debian/patches/00-build.patch +++ b/debian/patches/00-build.patch @@ -13,13 +13,13 @@ Forwarded: not-needed <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="groovy.jar" location="tools/groovy-all-2.4.5.jar"/> + <property name="antcontrib.jar" value="/usr/share/java/ant-contrib.jar"/> + <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) default: 9 --> -@@ -29,6 +30,19 @@ +@@ -25,6 +26,19 @@ <condition property="isJava9"> <equals arg1="${ant.java.version}" arg2="1.9" /> </condition> @@ -39,7 +39,7 @@ Forwarded: not-needed <!-- ** Used by Eclipse ant builder for updating -@@ -75,10 +89,9 @@ +@@ -71,10 +85,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> -@@ -89,8 +102,10 @@ +@@ -85,8 +98,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> <!-- -@@ -110,7 +125,8 @@ Build-Date: ${build.tstamp} +@@ -106,7 +121,8 @@ Build-Date: ${build.tstamp} <copy file="README" todir="build"/> <copy file="LICENSE" todir="build"/> <!-- create josm-custom.jar --> @@ -74,7 +74,7 @@ Forwarded: not-needed <jar destfile="dist/josm-custom.jar" basedir="build" level="${clevel}"> <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar --> <manifest> -@@ -120,6 +136,8 @@ Build-Date: ${build.tstamp} +@@ -116,6 +132,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 +83,7 @@ Forwarded: not-needed </manifest> <zipfileset dir="images" prefix="images"/> <zipfileset dir="data" prefix="data"/> -@@ -190,10 +208,7 @@ Build-Date: ${build.tstamp} +@@ -186,10 +204,7 @@ Build-Date: ${build.tstamp} </target> <target name="javacc" depends="init" unless="javacc.notRequired"> <mkdir dir="${mapcss.dir}/parsergen"/> @@ -95,7 +95,7 @@ Forwarded: not-needed <arg value="-DEBUG_PARSER=false"/> <arg value="-DEBUG_TOKEN_MANAGER=false"/> <arg value="-JDK_VERSION=1.7"/> -@@ -204,31 +219,19 @@ Build-Date: ${build.tstamp} +@@ -200,31 +215,19 @@ Build-Date: ${build.tstamp} </target> <target name="compile" depends="init,javacc"> <!-- COTS --> @@ -131,7 +131,7 @@ Forwarded: not-needed 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"/> -@@ -245,7 +248,7 @@ Build-Date: ${build.tstamp} +@@ -241,7 +244,7 @@ Build-Date: ${build.tstamp} <compilerarg value="-XDignore.symbol.file"/> </javac> <!-- JOSM --> @@ -140,7 +140,7 @@ Forwarded: not-needed 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"/> -@@ -272,6 +275,7 @@ Build-Date: ${build.tstamp} +@@ -268,6 +271,7 @@ Build-Date: ${build.tstamp} </uptodate> <mkdir dir="build"/> <mkdir dir="dist"/> @@ -148,7 +148,7 @@ Forwarded: not-needed </target> <target name="javadoc"> <javadoc destdir="javadoc" -@@ -294,6 +298,7 @@ Build-Date: ${build.tstamp} +@@ -290,6 +294,7 @@ Build-Date: ${build.tstamp} <delete dir="${mapcss.dir}/parsergen"/> <delete file="${src.dir}/org/w3/_2001/xmlschema/Adapter1.java"/> <delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/> diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch index 7f94291..6989936 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 -@@ -230,14 +230,19 @@ public final class MapPaintStyles { +@@ -231,14 +231,19 @@ public final class MapPaintStyles { } if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) { @@ -30,17 +30,17 @@ Forwarded: not-needed public static void readFromPreferences() { styles.clear(); ---- a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java -+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java -@@ -44,6 +44,7 @@ import org.openstreetmap.josm.gui.Extend - import org.openstreetmap.josm.gui.MapView; +--- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java ++++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java +@@ -46,6 +46,7 @@ import org.openstreetmap.josm.gui.MapVie + import org.openstreetmap.josm.gui.Notification; import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor; import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.mappaint.MapPaintStyles; import org.openstreetmap.josm.gui.preferences.ToolbarPreferences; - import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Link; - import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.PresetLink; -@@ -160,8 +161,15 @@ public class TaggingPreset extends Abstr + import org.openstreetmap.josm.gui.tagging.presets.items.Key; + import org.openstreetmap.josm.gui.tagging.presets.items.Label; +@@ -178,8 +179,15 @@ public class TaggingPreset extends Abstr return; } File arch = TaggingPresetReader.getZipIcons(); @@ -58,26 +58,26 @@ Forwarded: not-needed imgProv.setDirs(s); imgProv.setId("presets"); imgProv.setArchive(arch); -@@ -177,7 +185,7 @@ public class TaggingPreset extends Abstr +@@ -195,7 +203,7 @@ public class TaggingPreset extends Abstr } }); } else { -- Main.warn("Could not get presets icon " + iconName); -+ Main.warn("Could not get presets icon " + realIconName); +- Main.warn(TaggingPreset.this + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName); ++ Main.warn(TaggingPreset.this + ": " + PRESET_ICON_ERROR_MSG_PREFIX + realIconName); } } }); ---- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java -+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java -@@ -56,6 +56,7 @@ import org.openstreetmap.josm.data.osm.O - import org.openstreetmap.josm.data.osm.OsmUtils; +--- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java ++++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java +@@ -20,6 +20,7 @@ import org.openstreetmap.josm.Main; + import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.Tag; - import org.openstreetmap.josm.data.preferences.BooleanProperty; + import org.openstreetmap.josm.gui.layer.OsmDataLayer; +import org.openstreetmap.josm.gui.mappaint.MapPaintStyles; import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField; - import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority; import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList; -@@ -1570,12 +1571,22 @@ public final class TaggingPresetItems { + import org.openstreetmap.josm.tools.ImageProvider; +@@ -124,11 +125,21 @@ public abstract class TaggingPresetItem } protected static ImageIcon loadImageIcon(String iconName, File zipIcons, Integer maxSize) { @@ -101,5 +101,4 @@ Forwarded: not-needed + } + return icon; } - - protected static Integer parseInteger(String str) { + } diff --git a/debian/patches/03-default_look_and_feel.patch b/debian/patches/03-default_look_and_feel.patch index 42eb52b..a3ec1e7 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 -@@ -162,7 +162,7 @@ public class PlatformHookUnixoid impleme +@@ -161,7 +161,7 @@ public class PlatformHookUnixoid impleme @Override public String getDefaultStyle() { diff --git a/debian/patches/04-use_system_jmapviewer.patch b/debian/patches/04-use_system_jmapviewer.patch index 88f1237..e74df7e 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 -@@ -142,7 +142,6 @@ Debian-Release: ${debian.version} +@@ -138,7 +138,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 7d1dd26..5149fbd 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 -@@ -131,7 +131,7 @@ Debian-Release: ${debian.version} +@@ -127,7 +127,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 5fd6637..d35fdd5 100644 --- a/debian/patches/06-move_data_out_of_jar.patch +++ b/debian/patches/06-move_data_out_of_jar.patch @@ -18,9 +18,9 @@ Forwarded: not-needed } private static URL getTranslationFile(String lang) { -- return Main.class.getResource("/data/"+lang.replace("@", "-")+".lang"); +- return Main.class.getResource("/data/"+lang.replace('@', '-')+".lang"); + try { -+ return Main.class.getResource("/data/"+lang.replace("@", "-")+".lang"); ++ return Main.class.getResource("/data/"+lang.replace('@', '-')+".lang"); + } catch (RuntimeException ex) { + return null; + } @@ -54,7 +54,7 @@ Forwarded: not-needed } --- a/build.xml +++ b/build.xml -@@ -139,9 +139,9 @@ Debian-Release: ${debian.version} +@@ -135,9 +135,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-josm-desktop-fixes.patch b/debian/patches/08-josm-desktop-fixes.patch deleted file mode 100644 index 4b14a34..0000000 --- a/debian/patches/08-josm-desktop-fixes.patch +++ /dev/null @@ -1,39 +0,0 @@ -Description: Add Keywords to josm{,-latest}.desktop + validation fixes. -Author: Bas Couwenberg <sebas...@debian.org> -Forwarded: https://josm.openstreetmap.de/ticket/11952 -Applied-Upstream: https://josm.openstreetmap.de/changeset/8841/josm - ---- a/linux/latest/usr/share/applications/josm-latest.desktop -+++ b/linux/latest/usr/share/applications/josm-latest.desktop -@@ -4,10 +4,11 @@ Version=1.0 - Name=JOSM (latest snapshot) - GenericName=Java OpenStreetMap Editor (latest) - Comment=Extensible off-line editor for OpenStreetMap (OSM) --Icon=josm-latest.png -+Icon=josm-latest - Exec=josm-latest %F - Terminal=false --MimeType=application/x-osm+xml;application/x-gpx+xml -+MimeType=application/x-osm+xml;application/x-gpx+xml; - StartupNotify=true --Categories=Education;Geoscience;Maps -+Categories=Education;Geoscience;Maps; - StartupWMClass=org-openstreetmap-josm-Main -+Keywords=OpenStreetMap;OSM; ---- a/linux/tested/usr/share/applications/josm.desktop -+++ b/linux/tested/usr/share/applications/josm.desktop -@@ -4,10 +4,11 @@ Version=1.0 - Name=JOSM - GenericName=Java OpenStreetMap Editor - Comment=Extensible off-line editor for OpenStreetMap (OSM) --Icon=josm.png -+Icon=josm - Exec=josm %F - Terminal=false --MimeType=application/x-osm+xml;application/x-gpx+xml -+MimeType=application/x-osm+xml;application/x-gpx+xml; - StartupNotify=true --Categories=Education;Geoscience;Maps -+Categories=Education;Geoscience;Maps; - StartupWMClass=org-openstreetmap-josm-Main -+Keywords=OpenStreetMap;OSM; diff --git a/debian/patches/series b/debian/patches/series index c7490a9..cc73016 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,4 +6,3 @@ 05-fix_version.patch 06-move_data_out_of_jar.patch 07-use_system_fonts.patch -08-josm-desktop-fixes.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