This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository josm.
commit 0c6bb2d8493fc8f5ce4c6bbdecfae96b54b156f6 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Mon Apr 27 22:14:32 2015 +0200 Refresh patches, add dependencies for commons-jcs & commons-logging. --- debian/changelog | 1 + debian/control | 4 +++ debian/patches/00-build.patch | 45 +++++++++++++++++++-------- debian/patches/02-elemstyles.patch | 6 ++-- debian/patches/04-use_system_jmapviewer.patch | 2 +- debian/patches/05-fix_version.patch | 2 +- debian/patches/06-move_data_out_of_jar.patch | 8 ++--- 7 files changed, 46 insertions(+), 22 deletions(-) diff --git a/debian/changelog b/debian/changelog index f1b57fd..c5f3bd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ josm (0.0.svn8279+dfsg1-1) UNRELEASED; urgency=medium * New tested snapshot. + * Refresh patches, add dependencies for commons-jcs & commons-logging. -- Bas Couwenberg <sebas...@debian.org> Mon, 27 Apr 2015 20:25:45 +0200 diff --git a/debian/control b/debian/control index b830802..2c525bd 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,8 @@ Build-Depends: debhelper (>= 9~), 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), libmetadata-extractor-java (>= 2.7.2), @@ -33,6 +35,8 @@ 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), libsvgsalamander-java, diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch index f2b5c87..a1c3244 100644 --- a/debian/patches/00-build.patch +++ b/debian/patches/00-build.patch @@ -21,7 +21,7 @@ JARs and not depend on Internet connection. <property name="imagerytypes.dir" location="${src.dir}/org/openstreetmap/josm/data/imagery/types"/> <!-- build parameter: compression level (ant -Dclevel=N) N ranges from 0 (no compression) to 9 (maximum compression) -@@ -25,6 +26,19 @@ +@@ -25,6 +26,21 @@ <condition property="isWindows"> <os family="Windows"/> </condition> @@ -34,6 +34,8 @@ 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> + </path> @@ -41,7 +43,7 @@ JARs and not depend on Internet connection. <!-- ** Used by Eclipse ant builder for updating -@@ -71,10 +85,9 @@ +@@ -71,10 +87,9 @@ <!-- ** Creates the REVISION file to be included in the distribution --> @@ -54,7 +56,7 @@ JARs and not depend on Internet connection. <tstamp> <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/> </tstamp> -@@ -87,6 +100,7 @@ +@@ -87,6 +102,7 @@ Revision: ${version.entry.commit.revision} Is-Local-Build: true Build-Date: ${build.tstamp} @@ -62,7 +64,7 @@ JARs and not depend on Internet connection. </echo> </target> <!-- -@@ -106,7 +120,8 @@ Build-Date: ${build.tstamp} +@@ -106,7 +122,8 @@ Build-Date: ${build.tstamp} <copy file="README" todir="build"/> <copy file="LICENSE" todir="build"/> <!-- create josm-custom.jar --> @@ -72,7 +74,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 +131,8 @@ Build-Date: ${build.tstamp} +@@ -116,6 +133,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"/> @@ -81,7 +83,7 @@ JARs and not depend on Internet connection. </manifest> <zipfileset dir="images" prefix="images"/> <zipfileset dir="data" prefix="data"/> -@@ -186,10 +203,7 @@ Build-Date: ${build.tstamp} +@@ -186,10 +205,7 @@ Build-Date: ${build.tstamp} </target> <target name="javacc" depends="init" unless="javacc.notRequired"> <mkdir dir="${mapcss.dir}/parsergen"/> @@ -93,16 +95,33 @@ 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,15 +228,10 @@ Build-Date: ${build.tstamp} +@@ -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" -- excludes="org/apache/commons/compress/compressors/lzma/**,org/apache/commons/compress/compressors/xz/**,org/apache/commons/compress/compressors/CompressorStreamFactory.java,org/apache/commons/compress/compressors/deflate/**,org/apache/commons/compress/compressors/gzip/**,org/apache/commons/compress/compressors/lzw/**,org/apache/commons/compress/compressors/pack200/**,org/apache/commons/compress/compressors/snappy/**,org/apache/commons/compress/compressors/z/**" -- destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="iso-8859-1"> +- <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"/> +- <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/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/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> + <!-- I18N --> + <ant dir="i18n" /> @@ -112,7 +131,7 @@ JARs and not depend on Internet connection. 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"/> -@@ -251,6 +260,7 @@ Build-Date: ${build.tstamp} +@@ -268,6 +262,7 @@ Build-Date: ${build.tstamp} </uptodate> <mkdir dir="build"/> <mkdir dir="dist"/> @@ -120,7 +139,7 @@ JARs and not depend on Internet connection. </target> <target name="javadoc"> <javadoc destdir="javadoc" -@@ -272,6 +282,7 @@ Build-Date: ${build.tstamp} +@@ -289,6 +284,7 @@ Build-Date: ${build.tstamp} <delete dir="dist"/> <delete dir="${mapcss.dir}/parsergen"/> <delete dir="${imagerytypes.dir}"/> @@ -172,7 +191,7 @@ JARs and not depend on Internet connection. </target> <target name="singleplugintrans" depends="po/josm.pot,init"> <antcall target="plugintrans"> -@@ -139,15 +139,14 @@ +@@ -138,15 +138,14 @@ </if> <delete dir="${po.build.dir}/plugin_${dir}"/> </target> diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch index 3aeb8a6..b03e3e4 100644 --- a/debian/patches/02-elemstyles.patch +++ b/debian/patches/02-elemstyles.patch @@ -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; -@@ -147,8 +148,15 @@ public class TaggingPreset extends Abstr - */ +@@ -149,8 +150,15 @@ public class TaggingPreset extends Abstr public void setIcon(final String iconName) { + this.iconName = iconName; 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); -@@ -164,7 +172,7 @@ public class TaggingPreset extends Abstr +@@ -166,7 +174,7 @@ public class TaggingPreset extends Abstr } }); } else { diff --git a/debian/patches/04-use_system_jmapviewer.patch b/debian/patches/04-use_system_jmapviewer.patch index 87e5e72..179b2ef 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 -@@ -137,7 +137,6 @@ Debian-Release: ${debian.version} +@@ -139,7 +139,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 308d75a..0562e59 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 -@@ -126,7 +126,7 @@ Debian-Release: ${debian.version} +@@ -128,7 +128,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 03a6ad2..a18ef77 100644 --- a/debian/patches/06-move_data_out_of_jar.patch +++ b/debian/patches/06-move_data_out_of_jar.patch @@ -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; -@@ -345,7 +346,11 @@ public final class I18n { +@@ -348,7 +349,11 @@ public final class I18n { } private static URL getTranslationFile(String lang) { -- return Main.class.getResource("/data/"+lang+".lang"); +- return Main.class.getResource("/data/"+lang.replace("@","-")+".lang"); + try { -+ return new URL("file:///usr/share/josm/data/"+lang+".lang"); ++ return new URL("file:///usr/share/josm/data/"+lang.replace("@","-")+".lang"); + } catch (MalformedURLException ex) { + return null; + } @@ -61,7 +61,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608 } --- a/build.xml +++ b/build.xml -@@ -134,9 +134,9 @@ Debian-Release: ${debian.version} +@@ -136,9 +136,9 @@ Debian-Release: ${debian.version} <attribute name="Debian-Release" value="${debian.version}"/> <attribute name="Class-Path" value="${classpathprop}"/> </manifest> -- 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