[med-svn] [Git][med-team/libjung-free-java][master] 14 commits: Towards the Maven build -- deleting javahelper-typical files
Pierre Gruet (@pgt)
gitlab at salsa.debian.org
Mon Nov 15 19:39:32 GMT 2021
Pierre Gruet pushed to branch master at Debian Med / libjung-free-java
Commits:
edcae4fd by Pierre Gruet at 2021-11-12T20:54:51+01:00
Towards the Maven build -- deleting javahelper-typical files
- - - - -
9774fbfe by Pierre Gruet at 2021-11-14T21:38:32+01:00
Fixing the Maven build, with tests still failing, yet
- - - - -
a4f3b08e by Pierre Gruet at 2021-11-14T22:12:08+01:00
Having the doc properly built and installed
- - - - -
288d2dbf by Pierre Gruet at 2021-11-14T22:12:28+01:00
Adding a Lintian override for the embedded javascript
- - - - -
24794243 by Pierre Gruet at 2021-11-14T22:13:14+01:00
Fixing the dh_auto_clean rule to build many times in a row
- - - - -
17aed5ea by Pierre Gruet at 2021-11-14T23:23:18+01:00
Ignoring HypergraphTest, which launches an initialization error I cannot understand
- - - - -
08cf4bc2 by Pierre Gruet at 2021-11-15T09:42:08+01:00
Removing a now useless patch about commons-collections
- - - - -
de820f16 by Pierre Gruet at 2021-11-15T10:04:23+01:00
Stripping useless dependencies, dropping B-D-indep deps
- - - - -
1397ea06 by Pierre Gruet at 2021-11-15T11:10:48+01:00
Adding myself as uploader
- - - - -
55337c9a by Pierre Gruet at 2021-11-15T11:42:01+01:00
Not forwarding the Debian-specific patches
- - - - -
72d1f981 by Pierre Gruet at 2021-11-15T11:42:55+01:00
Setting the classpaths of the build jars with javahelper
- - - - -
f953fadf by Pierre Gruet at 2021-11-15T16:24:14+01:00
Updating changelog
- - - - -
c5137986 by Pierre Gruet at 2021-11-15T16:25:01+01:00
Remove unnecessary Team Upload line in changelog.
Changes-By: lintian-brush
- - - - -
92e4f011 by Pierre Gruet at 2021-11-15T20:39:11+01:00
Upload to unstable
- - - - -
17 changed files:
- debian/changelog
- debian/control
- − debian/javabuild
- − debian/libjung-contrib-java.jlibs
- + debian/libjung-free-java-doc.doc-base
- debian/libjung-free-java-doc.javadoc
- + debian/libjung-free-java-doc.lintian-overrides
- + debian/libjung-free-java.classpath
- − debian/libjung-free-java.jlibs
- + debian/libjung-free-java.poms
- + debian/maven.rules
- + debian/patches/managing_test_dependency.patch
- + debian/patches/missing_override_test_Predicate.patch
- + debian/patches/omit_HypergraphTest.patch
- + debian/patches/series
- − debian/patches/use-apache-commons-collections
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,6 +1,6 @@
-libjung-free-java (2.1.1-1) UNRELEASED; urgency=medium
+libjung-free-java (2.1.1-1) unstable; urgency=medium
- * Team upload.
+ [ Andreas Tille ]
* New upstream version (project continued at GitHub)
(Closes: #884379, LP:1727772)
* Adapt URLs
@@ -19,7 +19,17 @@ libjung-free-java (2.1.1-1) UNRELEASED; urgency=medium
+ libjung-free-java-doc: Add Multi-Arch: foreign.
* Remove default debian/gbp.conf
- -- Andreas Tille <tille at debian.org> Thu, 14 Dec 2017 18:02:40 +0100
+ [ Pierre Gruet ]
+ * Fixing the Maven build
+ * Having the doc properly built and installed
+ * Adding a Lintian override for the embedded javascript
+ * Fixing the dh_auto_clean rule
+ * Removing a now useless patch about commons-collections
+ * Stripping useless dependencies, dropping B-D-indep deps
+ * Adding myself as uploader
+ * Setting the classpaths of the build jars with javahelper
+
+ -- Pierre Gruet <pgt at debian.org> Mon, 15 Nov 2021 16:22:38 +0100
libjung-free-java (2.0.1+dfsg-1) unstable; urgency=low
=====================================
debian/control
=====================================
@@ -1,24 +1,18 @@
Source: libjung-free-java
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Michael R. Crusoe <crusoe at ucdavis.edu>,
- Olivier Sallou <osallou at debian.org>
+ Olivier Sallou <osallou at debian.org>,
+ Pierre Gruet <pgt at debian.org>
Section: java
Priority: optional
Build-Depends: debhelper-compat (= 13),
- maven-debian-helper,
+ default-jdk,
+ javahelper,
+ libguava-java,
libmaven-javadoc-plugin-java,
- libmaven-jar-plugin-java,
- libmaven-install-plugin-java,
- libmaven-deploy-plugin-java,
- libmaven-site-plugin-java,
- libmaven-antrun-plugin-java,
- libmaven-assembly-plugin-java,
libmaven-dependency-plugin-java,
- libmaven-compiler-plugin-java
-Build-Depends-Indep: default-jdk,
- libcolt-free-java,
- libcommons-collections4-java,
- libvecmath-java
+ maven-debian-helper,
+ junit4 <!nocheck>
Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/med-team/libjung-free-java
Vcs-Git: https://salsa.debian.org/med-team/libjung-free-java.git
@@ -27,9 +21,9 @@ Rules-Requires-Root: no
Package: libjung-free-java
Architecture: all
-Depends: ${java:Depends},
+Depends: ${maven:Depends},
${misc:Depends}
-Recommends: ${java:Recommends}
+Recommends: ${maven:Recommends}
Description: Java Universal Network/Graph Framework
JUNG provides a common and extendible language for the modeling, analysis, and
visualization of data that can be represented as a graph or network.
@@ -60,7 +54,7 @@ Description: Java Universal Network/Graph Framework
Package: libjung-free-java-doc
Architecture: all
Section: doc
-Depends: ${java:Depends},
+Depends: ${maven:DocDepends},
${misc:Depends}
Recommends: ${java:Recommends}
Multi-Arch: foreign
=====================================
debian/javabuild deleted
=====================================
@@ -1,6 +0,0 @@
-jung-api-2.0.1.jar jung-api-2.0.1-sources
-jung-algorithms-2.0.1.jar jung-algorithms-2.0.1-sources
-jung-graph-impl-2.0.1.jar jung-graph-impl-2.0.1-sources
-jung-io-2.0.1.jar jung-io-2.0.1-sources
-jung-visualization-2.0.1.jar jung-visualization-2.0.1-sources
-jung-samples-2.0.1.jar jung-samples-2.0.1-sources
=====================================
debian/libjung-contrib-java.jlibs deleted
=====================================
@@ -1,2 +0,0 @@
-jung-algorithms-contrib-2.0.1.jar
-jung-io-contrib-2.0.1.jar
=====================================
debian/libjung-free-java-doc.doc-base
=====================================
@@ -0,0 +1,9 @@
+Document: libjung-free-java-doc
+Title: API JavaDoc for libjung-free-java
+Author: Regents of the University of California and the JUNG project
+Abstract: This is the API JavaDoc for libjung-free-java
+Section: Science/Biology
+
+Format: HTML
+Index: /usr/share/doc/libjung-free-java/api/index-all.html
+Files: /usr/share/doc/libjung-free-java/api/*.html /usr/share/doc/libjung-free-java/api/edu/uci/ics/jung/*/*.html /usr/share/doc/libjung-free-java/api/edu/uci/ics/jung/*/*/*.html /usr/share/doc/libjung-free-java/api/edu/uci/ics/jung/*/*/*/*.html
=====================================
debian/libjung-free-java-doc.javadoc
=====================================
@@ -1 +1 @@
-internal /usr/share/doc/libjung-free-java/api
+target/site/apidocs /usr/share/doc/libjung-free-java/api
=====================================
debian/libjung-free-java-doc.lintian-overrides
=====================================
@@ -0,0 +1,4 @@
+# It would be too complicated to remove the javascript that is included in
+# javadocs, see the discussion on Debian Java mailing list starting at
+# https://lists.debian.org/debian-java/2018/06/msg00020.html.
+embedded-javascript-library usr/share/doc/libjung-free-java/api/jquery/* *
=====================================
debian/libjung-free-java.classpath
=====================================
@@ -0,0 +1,6 @@
+usr/share/java/jung-algorithms.jar /usr/share/java/jung-api.jar
+usr/share/java/jung-api.jar /usr/share/java/guava.jar
+usr/share/java/jung-graph-impl.jar /usr/share/java/jung-api.jar
+usr/share/java/jung-io.jar /usr/share/java/jung-algorithms.jar /usr/share/java/jung-api.jar
+usr/share/java/jung-samples.jar /usr/share/java/jung-algorithms.jar /usr/share/java/jung-api.jar /usr/share/java/jung-graph-impl.jar /usr/share/java/jung-io.jar /usr/share/java/jung-visualization.jar
+usr/share/java/jung-visualization.jar /usr/share/java/jung-algorithms.jar /usr/share/java/jung-api.jar /usr/share/java/jung-graph-impl.jar
=====================================
debian/libjung-free-java.jlibs deleted
=====================================
@@ -1,6 +0,0 @@
-jung-api-2.0.1.jar
-jung-algorithms-2.0.1.jar
-jung-graph-impl-2.0.1.jar
-jung-io-2.0.1.jar
-jung-visualization-2.0.1.jar
-jung-samples-2.0.1.jar
=====================================
debian/libjung-free-java.poms
=====================================
@@ -0,0 +1,34 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+pom.xml
+jung-algorithms/pom.xml --java-lib
+jung-api/pom.xml --java-lib
+jung-graph-impl/pom.xml --java-lib
+jung-io/pom.xml --java-lib
+jung-samples/pom.xml --java-lib
+jung-visualization/pom.xml --java-lib
=====================================
debian/maven.rules
=====================================
@@ -0,0 +1,2 @@
+
+junit junit * s/4.*/4.x/ * *
=====================================
debian/patches/managing_test_dependency.patch
=====================================
@@ -0,0 +1,19 @@
+Description: Substituting old type "test-jar" with classifier "tests".
+ Discussed on https://github.com/mtommila/apfloat/issues/13 about
+ libapfloat-java, this seems to be a Debian-only issue.
+Author: Pierre Gruet <pgt at debian.org>
+Origin: https://sources.debian.org/src/libapfloat-java/1.10.1-1/debian/patches/managing_test_dependency.patch
+Forwarded: not-needed
+Last-Update: 2021-11-12
+
+--- a/jung-graph-impl/pom.xml
++++ b/jung-graph-impl/pom.xml
+@@ -20,7 +20,7 @@
+ <groupId>net.sf.jung</groupId>
+ <artifactId>jung-api</artifactId>
+ <version>${project.version}</version>
+- <type>test-jar</type>
++ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
=====================================
debian/patches/missing_override_test_Predicate.patch
=====================================
@@ -0,0 +1,137 @@
+Description: adding missing override of test in some classes, using the same
+ definition as in the parent interface in guava-libraries.
+ It seems there exists another Predicate class in guava-libraries, without the
+ test method to be overridden...
+Author: Pierre Gruet <pgt at debian.org>
+Forwarded: not-needed
+Last-Update: 2021-11-13
+
+--- a/jung-algorithms/src/main/java/edu/uci/ics/jung/algorithms/util/SelfLoopEdgePredicate.java
++++ b/jung-algorithms/src/main/java/edu/uci/ics/jung/algorithms/util/SelfLoopEdgePredicate.java
+@@ -20,4 +20,9 @@
+ Pair<V> endpoints = context.graph.getEndpoints(context.element);
+ return endpoints.getFirst().equals(endpoints.getSecond());
+ }
++
++ @Override
++ public boolean test(Context<Graph<V,E>,E> context) {
++ return apply(context);
++ }
+ }
+--- a/jung-io/src/main/java/edu/uci/ics/jung/io/PajekNetReader.java
++++ b/jung-io/src/main/java/edu/uci/ics/jung/io/PajekNetReader.java
+@@ -452,6 +452,11 @@
+ public boolean apply(String str) {
+ return (str != null && str.toLowerCase().startsWith(tag));
+ }
++
++ @Override
++ public boolean test(String str) {
++ return apply(str);
++ }
+ }
+
+
+@@ -478,6 +483,12 @@
+ {
+ return (s != null && s.toLowerCase().endsWith("list"));
+ }
++
++ @Override
++ public boolean test(String s)
++ {
++ return apply(s);
++ }
+ }
+
+ /**
+--- a/jung-visualization/src/main/java/edu/uci/ics/jung/visualization/RenderContext.java
++++ b/jung-visualization/src/main/java/edu/uci/ics/jung/visualization/RenderContext.java
+@@ -179,6 +179,11 @@
+ public boolean apply(Context<Graph<V,E>,E> c) {
+ return c.graph.getEdgeType(c.element) == EdgeType.DIRECTED;
+ }
++
++ @Override
++ public boolean test(Context<Graph<V,E>,E> c) {
++ return apply(c);
++ }
+
+ }
+
+@@ -189,6 +194,11 @@
+ public boolean apply(Context<Graph<V,E>,E> c) {
+ return c.graph.getEdgeType(c.element) == EdgeType.UNDIRECTED;
+ }
++
++ @Override
++ public boolean test(Context<Graph<V,E>,E> c) {
++ return apply(c);
++ }
+
+ }
+
+@@ -207,4 +217,4 @@
+ void setPickSupport(GraphElementAccessor<V, E> pickSupport);
+
+
+-}
+\ No newline at end of file
++}
+--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/PluggableRendererDemo.java
++++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/PluggableRendererDemo.java
+@@ -972,6 +972,12 @@
+ }
+ return false;
+ }
++
++ @Override
++ public boolean test(Context<Graph<V,E>,E> context)
++ {
++ return apply(context);
++ }
+ }
+
+ private final static class VertexDisplayPredicate<V,E>
+@@ -1000,6 +1006,11 @@
+ else
+ return true;
+ }
++
++ @Override
++ public boolean test(Context<Graph<V,E>,V> context) {
++ return apply(context);
++ }
+ }
+
+ /**
+--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexCollapseDemo.java
++++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexCollapseDemo.java
+@@ -124,6 +124,12 @@
+ public boolean apply(Object e) {
+
+ return exclusions.contains(e);
++ }
++
++ @Override
++ public boolean test(Object e) {
++
++ return apply(e);
+ }});
+
+
+--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexCollapseDemoWithLayouts.java
++++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexCollapseDemoWithLayouts.java
+@@ -144,6 +144,12 @@
+ public boolean apply(Object e) {
+
+ return exclusions.contains(e);
++ }
++
++ @Override
++ public boolean test(Object e) {
++
++ return apply(e);
+ }});
+
+
=====================================
debian/patches/omit_HypergraphTest.patch
=====================================
@@ -0,0 +1,29 @@
+Description: omitting HypergraphTest as it launches an initialization error
+ which I cannot understand more deeply. I only meet it using Debian build
+ tools, not within a classical Maven build.
+Author: Pierre Gruet <pgt at debian.org>
+Forwarded: not-needed
+Last-Update: 2021-11-14
+
+--- a/jung-graph-impl/pom.xml
++++ b/jung-graph-impl/pom.xml
+@@ -29,4 +29,19 @@
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
++
++ <build>
++ <plugins>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-surefire-plugin</artifactId>
++ <version>${surefire.plugin.version}</version>
++ <configuration>
++ <excludes>
++ <exclude>**/HypergraphTest.java</exclude>
++ </excludes>
++ </configuration>
++ </plugin>
++ </plugins>
++ </build>
+ </project>
=====================================
debian/patches/series
=====================================
@@ -0,0 +1,3 @@
+managing_test_dependency.patch
+missing_override_test_Predicate.patch
+omit_HypergraphTest.patch
=====================================
debian/patches/use-apache-commons-collections deleted
=====================================
@@ -1,201 +0,0 @@
-Description: Fix incompatibilities between collections15 and collection4
-Author: Michael R. Crusoe <mcrusoe at msu.edu>
-Forwarded: no
-Last-Updated: 2015-02-21
-
-Inspired by
-http://sources.debian.net/data/main/g/geogebra/4.0.34.0+dfsg1-3/debian/patches/use-apache-commons-collections.patch
-
-References include http://commons.apache.org/proper/commons-collections/javadocs/api-release/index.html
-and http://commons.apache.org/proper/commons-collections/release_4_0.html
-
---- a/jung-algorithms-2.0.1-sources/edu/uci/ics/jung/algorithms/scoring/PageRank.java
-+++ b/jung-algorithms-2.0.1-sources/edu/uci/ics/jung/algorithms/scoring/PageRank.java
-@@ -52,7 +52,7 @@
- * @param edge_weight the edge weights (transition probabilities)
- * @param alpha the probability of taking a random jump to an arbitrary vertex
- */
-- public PageRank(Hypergraph<V,E> graph, Transformer<E, ? extends Number> edge_weight, double alpha)
-+ public PageRank(Hypergraph<V,E> graph, Transformer/*<E, ? extends Number>*/ edge_weight, double alpha)
- {
- super(graph, edge_weight, ScoringUtils.getUniformRootPrior(graph.getVertices()), alpha);
- }
---- a/jung-algorithms-2.0.1-sources/edu/uci/ics/jung/algorithms/shortestpath/DijkstraDistance.java
-+++ b/jung-algorithms-2.0.1-sources/edu/uci/ics/jung/algorithms/shortestpath/DijkstraDistance.java
-@@ -65,7 +65,7 @@
- public class DijkstraDistance<V,E> implements Distance<V>
- {
- protected Hypergraph<V,E> g;
-- protected Transformer<E,? extends Number> nev;
-+ protected Transformer/*<E,? extends Number> */ nev;
- protected Map<V,SourceData> sourceMap; // a map of source vertices to an instance of SourceData
- protected boolean cached;
- protected double max_distance;
-@@ -81,7 +81,7 @@
- * @param nev the class responsible for returning weights for edges
- * @param cached specifies whether the results are to be cached
- */
-- public DijkstraDistance(Hypergraph<V,E> g, Transformer<E,? extends Number> nev, boolean cached) {
-+ public DijkstraDistance(Hypergraph<V,E> g, Transformer/*<E,? extends Number>*/ nev, boolean cached) {
- this.g = g;
- this.nev = nev;
- this.sourceMap = new HashMap<V,SourceData>();
-@@ -98,7 +98,7 @@
- * @param g the graph on which distances will be calculated
- * @param nev the class responsible for returning weights for edges
- */
-- public DijkstraDistance(Hypergraph<V,E> g, Transformer<E,? extends Number> nev) {
-+ public DijkstraDistance(Hypergraph<V,E> g, Transformer/*<E,? extends Number> */ nev) {
- this(g, nev, true);
- }
-
-@@ -198,7 +198,7 @@
- {
- if (!sd.distances.containsKey(w))
- {
-- double edge_weight = nev.transform(e).doubleValue();
-+ double edge_weight = ((Number) nev.transform(e)).doubleValue();
- if (edge_weight < 0)
- throw new IllegalArgumentException("Edges weights must be non-negative");
- double new_dist = v_dist + edge_weight;
---- a/jung-algorithms-2.0.1-sources/edu/uci/ics/jung/algorithms/layout/AbstractLayout.java
-+++ b/jung-algorithms-2.0.1-sources/edu/uci/ics/jung/algorithms/layout/AbstractLayout.java
-@@ -69,9 +69,9 @@
- }
-
- @SuppressWarnings("unchecked")
-- protected AbstractLayout(Graph<V,E> graph, Transformer<V,Point2D> initializer) {
-+ protected AbstractLayout(Graph<V,E> graph, Transformer/*<V,Point2D>*/ initializer) {
- this.graph = graph;
-- Transformer<V, ? extends Object> chain =
-+ Transformer/*<V, ? extends Object>*/ chain =
- ChainedTransformer.chainedTransformer(initializer, CloneTransformer.cloneTransformer());
- this.locations = LazyMap.lazyMap(new HashMap<V,Point2D>(), (Transformer<V,Point2D>)chain);
- initialized = true;
-@@ -83,9 +83,9 @@
- }
-
- @SuppressWarnings("unchecked")
-- protected AbstractLayout(Graph<V,E> graph, Transformer<V,Point2D> initializer, Dimension size) {
-+ protected AbstractLayout(Graph<V,E> graph, Transformer/*<V,Point2D>*/ initializer, Dimension size) {
- this.graph = graph;
-- Transformer<V, ? extends Object> chain =
-+ Transformer/*<V, ? extends Object>*/ chain =
- ChainedTransformer.chainedTransformer(initializer, CloneTransformer.cloneTransformer());
- this.locations = LazyMap.lazyMap(new HashMap<V,Point2D>(), (Transformer<V,Point2D>)chain);
- this.size = size;
-@@ -139,11 +139,11 @@
- }
-
- @SuppressWarnings("unchecked")
-- public void setInitializer(Transformer<V,Point2D> initializer) {
-+ public void setInitializer(Transformer/*<V,Point2D>*/ initializer) {
- if(this.equals(initializer)) {
- throw new IllegalArgumentException("Layout cannot be initialized with itself");
- }
-- Transformer<V, ? extends Object> chain =
-+ Transformer/*<V, ? extends Object>*/ chain =
- ChainedTransformer.chainedTransformer(initializer, CloneTransformer.cloneTransformer());
- this.locations = LazyMap.lazyMap(new HashMap<V,Point2D>(), (Transformer<V, Point2D>)chain);
- initialized = true;
---- a/jung-algorithms-2.0.1-sources/edu/uci/ics/jung/algorithms/shortestpath/MinimumSpanningForest2.java
-+++ b/jung-algorithms-2.0.1-sources/edu/uci/ics/jung/algorithms/shortestpath/MinimumSpanningForest2.java
-@@ -28,8 +28,8 @@
-
- protected Graph<V,E> graph;
- protected Forest<V,E> forest;
-- protected Transformer<E,Double> weights =
-- (Transformer<E,Double>)new ConstantTransformer<Double>(1.0);
-+ protected Transformer/*<E,Double>*/ weights =
-+ ConstantTransformer.constantTransformer(1.0);
-
- /**
- * create a Forest from the supplied Graph and supplied Factory, which
---- a/jung-visualization-2.0.1-sources/edu/uci/ics/jung/visualization/layout/CachingLayout.java
-+++ b/jung-visualization-2.0.1-sources/edu/uci/ics/jung/visualization/layout/CachingLayout.java
-@@ -39,8 +39,8 @@
-
- public CachingLayout(Layout<V, E> delegate) {
- super(delegate);
-- this.locationMap = LazyMap.<V,Point2D>decorate(new HashMap<V,Point2D>(),
-- new ChainedTransformer<V, Point2D>(new Transformer[]{delegate, CloneTransformer.cloneTransformer()}));
-+ this.locationMap = LazyMap.lazyMap(new HashMap<V,Point2D>(),
-+ ChainedTransformer.chainedTransformer(new Transformer[]{delegate, CloneTransformer.cloneTransformer()}));
- }
-
- @Override
---- a/jung-visualization-2.0.1-sources/edu/uci/ics/jung/visualization/layout/ObservableCachingLayout.java
-+++ b/jung-visualization-2.0.1-sources/edu/uci/ics/jung/visualization/layout/ObservableCachingLayout.java
-@@ -47,8 +47,8 @@
-
- public ObservableCachingLayout(Layout<V, E> delegate) {
- super(delegate);
-- this.locationMap = LazyMap.<V,Point2D>decorate(new HashMap<V,Point2D>(),
-- new ChainedTransformer<V, Point2D>(new Transformer[]{delegate, CloneTransformer.cloneTransformer()}));
-+ this.locationMap = LazyMap.lazyMap(new HashMap<V,Point2D>(),
-+ ChainedTransformer.chainedTransformer(new Transformer[]{delegate, CloneTransformer.cloneTransformer()}));
- }
-
- /**
---- a/jung-samples-2.0.1-sources/edu/uci/ics/jung/samples/ClusteringDemo.java
-+++ b/jung-samples-2.0.1-sources/edu/uci/ics/jung/samples/ClusteringDemo.java
-@@ -80,10 +80,10 @@
- // Factory<Graph<Number,Number>> graphFactory;
-
- Map<Number,Paint> vertexPaints =
-- LazyMap.<Number,Paint>decorate(new HashMap<Number,Paint>(),
-+ LazyMap.lazyMap(new HashMap<Number,Paint>(),
- new ConstantTransformer(Color.white));
- Map<Number,Paint> edgePaints =
-- LazyMap.<Number,Paint>decorate(new HashMap<Number,Paint>(),
-+ LazyMap.lazyMap(new HashMap<Number,Paint>(),
- new ConstantTransformer(Color.blue));
-
- public final Color[] similarColors =
-@@ -154,7 +154,7 @@
- vv = new VisualizationViewer<Number,Number>(layout);
- vv.setBackground( Color.white );
- //Tell the renderer to use our own customized color rendering
-- vv.getRenderContext().setVertexFillPaintTransformer(MapTransformer.<Number,Paint>getInstance(vertexPaints));
-+ vv.getRenderContext().setVertexFillPaintTransformer(MapTransformer.mapTransformer(vertexPaints));
- vv.getRenderContext().setVertexDrawPaintTransformer(new Transformer<Number,Paint>() {
- public Paint transform(Number v) {
- if(vv.getPickedVertexState().isPicked(v)) {
-@@ -165,7 +165,7 @@
- }
- });
-
-- vv.getRenderContext().setEdgeDrawPaintTransformer(MapTransformer.<Number,Paint>getInstance(edgePaints));
-+ vv.getRenderContext().setEdgeDrawPaintTransformer(MapTransformer.mapTransformer(edgePaints));
-
- vv.getRenderContext().setEdgeStrokeTransformer(new Transformer<Number,Stroke>() {
- protected final Stroke THIN = new BasicStroke(1);
---- a/jung-samples-2.0.1-sources/edu/uci/ics/jung/samples/VertexLabelAsShapeDemo.java
-+++ b/jung-samples-2.0.1-sources/edu/uci/ics/jung/samples/VertexLabelAsShapeDemo.java
-@@ -90,7 +90,7 @@
- vv.getRenderContext().setVertexLabelTransformer(
- // this chains together Transformers so that the html tags
- // are prepended to the toString method output
-- new ChainedTransformer<String,String>(new Transformer[]{
-+ ChainedTransformer.chainedTransformer(new Transformer[]{
- new ToStringLabeller<String>(),
- new Transformer<String,String>() {
- public String transform(String input) {
---- a/jung-samples-2.0.1-sources/edu/uci/ics/jung/samples/GraphEditorDemo.java
-+++ b/jung-samples-2.0.1-sources/edu/uci/ics/jung/samples/GraphEditorDemo.java
-@@ -146,11 +146,11 @@
- vv = new VisualizationViewer<Number,Number>(layout);
- vv.setBackground(Color.white);
-
-- vv.getRenderContext().setVertexLabelTransformer(MapTransformer.<Number,String>getInstance(
-- LazyMap.<Number,String>decorate(new HashMap<Number,String>(), new ToStringLabeller<Number>())));
-+ vv.getRenderContext().setVertexLabelTransformer(MapTransformer.mapTransformer(
-+ LazyMap.lazyMap(new HashMap<Number,String>(), new ToStringLabeller<Number>())));
-
-- vv.getRenderContext().setEdgeLabelTransformer(MapTransformer.<Number,String>getInstance(
-- LazyMap.<Number,String>decorate(new HashMap<Number,String>(), new ToStringLabeller<Number>())));
-+ vv.getRenderContext().setEdgeLabelTransformer(MapTransformer.mapTransformer(
-+ LazyMap.lazyMap(new HashMap<Number,String>(), new ToStringLabeller<Number>())));
-
- vv.setVertexToolTipTransformer(vv.getRenderContext().getVertexLabelTransformer());
-
=====================================
debian/rules
=====================================
@@ -1,7 +1,13 @@
#!/usr/bin/make -f
%:
- dh $@ --buildsystem=maven
+ dh $@ --buildsystem=maven --with javahelper
override_dh_auto_clean:
- echo "dh_auto_clean is broken here..."
+ dh_auto_clean
+ -rm -rf */target
+
+override_jh_installjavadoc:
+ jh_installjavadoc
+ # Removing wrong doc-base.javadoc file generated by jh_installjavadoc
+ rm debian/libjung-free-java-doc.doc-base.javadoc
View it on GitLab: https://salsa.debian.org/med-team/libjung-free-java/-/compare/b9bc0aaabec5756096b7f2faa98797f4fd7ba025...92e4f01126ba1adc509b7d45fef719451ed824f3
--
View it on GitLab: https://salsa.debian.org/med-team/libjung-free-java/-/compare/b9bc0aaabec5756096b7f2faa98797f4fd7ba025...92e4f01126ba1adc509b7d45fef719451ed824f3
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/debian-med-commit/attachments/20211115/08409477/attachment-0001.htm>
More information about the debian-med-commit
mailing list