[Git][debian-gis-team/josm][master] 3 commits: Don't exclude entire jcs3/log subdirectory.
Bas Couwenberg
gitlab at salsa.debian.org
Tue Jun 2 19:56:50 BST 2020
Bas Couwenberg pushed to branch master at Debian GIS Project / josm
Commits:
ab2e0f70 by Bas Couwenberg at 2020-06-02T20:19:02+02:00
Don't exclude entire jcs3/log subdirectory.
- - - - -
4acb8c75 by Bas Couwenberg at 2020-06-02T20:36:51+02:00
Drop commons-logging, no longer required.
- - - - -
9117fb70 by Bas Couwenberg at 2020-06-02T20:46:47+02:00
Set distribution to unstable.
- - - - -
4 changed files:
- debian/changelog
- debian/control
- debian/patches/00-build.patch
- debian/patches/05-fix_version.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,8 +1,10 @@
-josm (0.0.svn16538+dfsg-2) UNRELEASED; urgency=medium
+josm (0.0.svn16538+dfsg-2) unstable; urgency=medium
* Add patch for missing tag2link sources.
+ * Don't exclude entire jcs3/log subdirectory.
+ * Drop commons-logging, no longer required.
- -- Bas Couwenberg <sebastic at debian.org> Tue, 02 Jun 2020 19:33:34 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 02 Jun 2020 20:46:39 +0200
josm (0.0.svn16538+dfsg-1) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -13,7 +13,6 @@ Build-Depends: debhelper (>= 10~),
javacc,
jmapviewer (>= 2.14),
libcommons-compress-java,
- libcommons-logging-java,
libgettext-ant-tasks-java,
libgettext-commons-java (>= 0.9.6),
liboauth-signpost-java (>= 1.2),
@@ -30,7 +29,6 @@ Depends: default-jre (>= 2:1.9) | java9-runtime,
fonts-noto,
jmapviewer (>= 2.14),
libcommons-compress-java,
- libcommons-logging-java,
libgettext-commons-java (>= 0.9.6),
liboauth-signpost-java (>= 1.2),
openjfx,
=====================================
debian/patches/00-build.patch
=====================================
@@ -32,7 +32,7 @@ Forwarded: not-needed
<property name="error_prone_core.jar" location="${tools.dir}/error_prone_core.jar"/>
<property name="error_prone_javac.jar" location="${tools.dir}/error_prone_javac.jar"/>
<property name="auto-value-annotations.jar" location="${tools.dir}/auto-value-annotations.jar"/>
-@@ -104,6 +107,18 @@
+@@ -104,6 +107,17 @@
<condition property="java.library.dir" value="jmods" else="lib">
<isset property="isJava9"/>
</condition>
@@ -43,7 +43,6 @@ Forwarded: not-needed
+ <include name="signpost-core.jar"/>
+ <include name="commons-codec.jar"/>
+ <include name="commons-compress.jar"/>
-+ <include name="commons-logging.jar"/>
+ <include name="jmapviewer.jar"/>
+ </fileset>
+ </path>
@@ -51,7 +50,7 @@ Forwarded: not-needed
<path id="processor.path">
<pathelement location="${error_prone_core.jar}"/>
<pathelement location="${dataflow.jar}"/>
-@@ -157,9 +172,8 @@
+@@ -157,9 +171,8 @@
<!--
** Creates the REVISION file to be included in the distribution
-->
@@ -63,7 +62,7 @@ Forwarded: not-needed
<tstamp>
<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
-@@ -169,8 +183,10 @@
+@@ -169,8 +182,10 @@
<echo file="${resources.dir}/REVISION">
# automatically generated by JOSM build.xml - do not edit
Revision: ${version.entry.commit.revision}
@@ -75,7 +74,7 @@ Forwarded: not-needed
</echo>
</target>
<!--
-@@ -184,13 +200,13 @@ Build-Date: ${build.tstamp}
+@@ -184,13 +199,13 @@ Build-Date: ${build.tstamp}
<!--
** Main target that builds JOSM and checks XML against schemas
-->
@@ -91,7 +90,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>
-@@ -200,6 +216,8 @@ Build-Date: ${build.tstamp}
+@@ -200,6 +215,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"/>
@@ -100,7 +99,7 @@ Forwarded: not-needed
<!-- Java 9 stuff. Entries are safely ignored by Java 8 -->
<attribute name="Add-Exports" value="java.desktop/com.apple.eawt java.desktop/com.sun.imageio.spi java.desktop/com.sun.imageio.plugins.jpeg 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" />
-@@ -269,38 +287,114 @@ Build-Date: ${build.tstamp}
+@@ -269,38 +286,109 @@ Build-Date: ${build.tstamp}
</exec>
</target>
<target name="javacc" depends="init" unless="javacc.notRequired">
@@ -195,17 +194,12 @@ Forwarded: not-needed
+ <exclude name="org/apache/commons/compress/compressors/zstandard/**"/>
+ <exclude name="org/apache/commons/compress/parallel/**"/>
+ <exclude name="org/apache/commons/compress/utils/ArchiveUtils*"/>
-+ <exclude name="org/apache/commons/logging/impl/AvalonLogger*"/>
-+ <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger*"/>
-+ <exclude name="org/apache/commons/logging/impl/Log4JLogger*"/>
-+ <exclude name="org/apache/commons/logging/impl/LogKitLogger*"/>
-+ <exclude name="org/apache/commons/logging/impl/ServletContextCleaner*"/>
+ <exclude name="org/apache/commons/jcs3/auxiliary/disk/jdbc/**"/>
+ <exclude name="org/apache/commons/jcs3/auxiliary/remote/http/client/**"/>
+ <exclude name="org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServlet*"/>
+ <exclude name="org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheStartupServlet*"/>
-+ <exclude name="org/apache/commons/jcs3/auxiliary/disk/jdbc/**"/>
-+ <exclude name="org/apache/commons/jcs3/log/**"/>
++ <exclude name="org/apache/commons/jcs3/log/Log4j2Factory*"/>
++ <exclude name="org/apache/commons/jcs3/log/Log4j2LogAdapter*"/>
+ <exclude name="org/apache/commons/jcs3/utils/servlet/**"/>
+ <exclude name="org/jetbrains/annotations/Debug.java"/>
+ <exclude name="org/openstreetmap/gui/jmapviewer/Demo*"/>
@@ -230,7 +224,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -314,11 +408,7 @@ Build-Date: ${build.tstamp}
+@@ -314,11 +402,7 @@ 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"/>
@@ -242,7 +236,7 @@ Forwarded: not-needed
</javac>
</target>
<target name="create-resources" depends="create-revision" description="Create generated resource files">
-@@ -343,6 +433,7 @@ Build-Date: ${build.tstamp}
+@@ -343,6 +427,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="${build.dir}"/>
<mkdir dir="${dist.dir}"/>
@@ -250,7 +244,7 @@ Forwarded: not-needed
</target>
<target name="javadoc" depends="init-properties">
<javadoc destdir="javadoc"
-@@ -381,6 +472,14 @@ Build-Date: ${build.tstamp}
+@@ -381,6 +466,14 @@ Build-Date: ${build.tstamp}
<delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
<delete file="${epsg.output}"/>
<delete file="${pmd.dir}/cache"/>
@@ -265,7 +259,7 @@ Forwarded: not-needed
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
-@@ -984,6 +1083,7 @@ Build-Date: ${build.tstamp}
+@@ -984,6 +1077,7 @@ Build-Date: ${build.tstamp}
<pathelement path="${resources.dir}"/>
<pathelement path="${proj-classpath}"/>
<pathelement path="${proj-build.dir}"/>
@@ -273,7 +267,7 @@ Forwarded: not-needed
</classpath>
<arg value="${base.dir}"/>
</java>
-@@ -1056,12 +1156,14 @@ Build-Date: ${build.tstamp}
+@@ -1056,12 +1150,14 @@ Build-Date: ${build.tstamp}
<move file="${modules.dir}/dots/summary.dot.png" tofile="${modules.dir}/josm-with-all-dependencies.png"/>
</target>
<target name="resolve" depends="init-ivy" unless="resolve.notRequired" description="Resolve Ivy dependencies">
=====================================
debian/patches/05-fix_version.patch
=====================================
@@ -8,7 +8,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -211,7 +211,7 @@ Debian-Release: ${debian.version}
+@@ -210,7 +210,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"/>
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/compare/0918c087ac0cdbafbf1ff25afd4549ae3585eea2...9117fb703ac8ffc44233011346f35dd416f6338f
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/compare/0918c087ac0cdbafbf1ff25afd4549ae3585eea2...9117fb703ac8ffc44233011346f35dd416f6338f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200602/03769005/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list