[Git][debian-gis-team/josm][master] 2 commits: Add service providers for org.apache.commons.jcs3.log.LogFactory. (closes: #962060)

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / josm


Commits:
05fbe10c by Bas Couwenberg at 2020-06-03T21:26:23+02:00
Add service providers for org.apache.commons.jcs3.log.LogFactory. (closes: #962060)

- - - - -
038b2370 by Bas Couwenberg at 2020-06-03T21:26:42+02:00
Set distribution to unstable.

- - - - -


2 changed files:

- debian/changelog
- debian/patches/00-build.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,11 @@
-josm (0.0.svn16538+dfsg-3) UNRELEASED; urgency=medium
+josm (0.0.svn16538+dfsg-3) unstable; urgency=medium
 
   * Also include properties for org.glassfish.
   * Use josm-tested-sources.jar instead of /tmp/josm-latest-sources.jar.
+  * Add service providers for org.apache.commons.jcs3.log.LogFactory.
+    (closes: #962060)
 
- -- Bas Couwenberg <sebastic at debian.org>  Wed, 03 Jun 2020 17:31:24 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 03 Jun 2020 21:26:30 +0200
 
 josm (0.0.svn16538+dfsg-2) unstable; urgency=medium
 


=====================================
debian/patches/00-build.patch
=====================================
@@ -90,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 +215,8 @@ Build-Date: ${build.tstamp}
+@@ -200,11 +215,17 @@ 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"/>
@@ -99,7 +99,16 @@ 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 +286,109 @@ Build-Date: ${build.tstamp}
+             </manifest>
+             <service type="java.text.spi.DecimalFormatSymbolsProvider" provider="org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider" />
++            <service type="org.apache.commons.jcs3.log.LogFactory">
++                <provider classname="org.apache.commons.jcs3.log.JulLogFactory"/>
++                <provider classname="org.apache.commons.jcs3.log.Log4j2Factory"/>
++            </service>
+         </jar>
+     </target>
+     <!-- Mac OS X target -->
+@@ -269,38 +290,109 @@ Build-Date: ${build.tstamp}
          </exec>
      </target>
      <target name="javacc" depends="init" unless="javacc.notRequired">
@@ -224,7 +233,7 @@ Forwarded: not-needed
              <compilerarg value="-Xlint:cast"/>
              <compilerarg value="-Xlint:deprecation"/>
              <compilerarg value="-Xlint:dep-ann"/>
-@@ -314,11 +402,7 @@ Build-Date: ${build.tstamp}
+@@ -314,11 +406,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"/>
@@ -236,7 +245,7 @@ Forwarded: not-needed
          </javac>
      </target>
      <target name="create-resources" depends="create-revision" description="Create generated resource files">
-@@ -343,6 +427,7 @@ Build-Date: ${build.tstamp}
+@@ -343,6 +431,7 @@ Build-Date: ${build.tstamp}
          </uptodate>
          <mkdir dir="${build.dir}"/>
          <mkdir dir="${dist.dir}"/>
@@ -244,7 +253,7 @@ Forwarded: not-needed
      </target>
      <target name="javadoc" depends="init-properties">
          <javadoc destdir="javadoc"
-@@ -381,6 +466,14 @@ Build-Date: ${build.tstamp}
+@@ -381,6 +470,14 @@ Build-Date: ${build.tstamp}
          <delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
          <delete file="${epsg.output}"/>
          <delete file="${pmd.dir}/cache"/>
@@ -259,7 +268,7 @@ Forwarded: not-needed
      </target>
      <macrodef name="init-test-preferences">
          <attribute name="testfamily"/>
-@@ -984,6 +1077,7 @@ Build-Date: ${build.tstamp}
+@@ -984,6 +1081,7 @@ Build-Date: ${build.tstamp}
                  <pathelement path="${resources.dir}"/>
                  <pathelement path="${proj-classpath}"/>
                  <pathelement path="${proj-build.dir}"/>
@@ -267,7 +276,7 @@ Forwarded: not-needed
              </classpath>
              <arg value="${base.dir}"/>
          </java>
-@@ -1056,12 +1150,14 @@ Build-Date: ${build.tstamp}
+@@ -1056,12 +1154,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">



View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/compare/a46e2488c9a33a30780ae78be8cdc53e23406b46...038b23708b688f25a0f0ad002c59efc71edb18c3

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/compare/a46e2488c9a33a30780ae78be8cdc53e23406b46...038b23708b688f25a0f0ad002c59efc71edb18c3
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/20200603/aa304e6a/attachment-0001.html>