[Git][java-team/cronometer][master] 3 commits: Fix FTBFS #1099222
Julien Plissonneau Duquène (@jpd)
gitlab at salsa.debian.org
Sat Mar 29 20:06:39 GMT 2025
Julien Plissonneau Duquène pushed to branch master at Debian Java Maintainers / cronometer
Commits:
823952a4 by Julien Plissonneau Duquène at 2025-03-29T19:57:33+00:00
Fix FTBFS #1099222
Signed-off-by: Julien Plissonneau Duquène <sre4ever at free.fr>
- - - - -
787cda1a by Julien Plissonneau Duquène at 2025-03-29T19:57:48+00:00
Promote Standards-Version to 4.7.2
Signed-off-by: Julien Plissonneau Duquène <sre4ever at free.fr>
- - - - -
73cecc7b by Julien Plissonneau Duquène at 2025-03-29T20:06:35+00:00
Merge branch 'fix-1099222' into 'master'
Fix FTBFS #1099222
See merge request java-team/cronometer!1
- - - - -
5 changed files:
- debian/changelog
- debian/control
- + debian/patches/07_java21_compatibility.diff
- + debian/patches/08_jfreechart_1_5_compatibility.diff
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+cronometer (0.9.9+dfsg1-2) UNRELEASED; urgency=medium
+
+ * Add a patch to use the newer jfreechart API. (Closes: #1099222)
+ * Raise source level to 1.8 (minimum still supported by the default JDK 21).
+ * Promote Standard-Version to 4.7.2 with no change.
+
+ -- Julien Plissonneau Duquène <sre4ever at free.fr> Sat, 29 Mar 2025 18:45:16 +0000
+
cronometer (0.9.9+dfsg1-1) unstable; urgency=medium
* DEP5
=====================================
debian/control
=====================================
@@ -9,7 +9,7 @@ Build-Depends-Indep: default-jdk (>= 2:1.8),
ant,
libjfreechart-java,
libswingx-java
-Standards-Version: 4.6.0
+Standards-Version: 4.7.2
Vcs-Browser: https://salsa.debian.org/java-team/cronometer
Vcs-Git: https://salsa.debian.org/java-team/cronometer.git
Homepage: https://cronometer.com/
=====================================
debian/patches/07_java21_compatibility.diff
=====================================
@@ -0,0 +1,19 @@
+Description: Java 21 compatibility
+Author: Julien Plissonneau Duquène <sre4ever at free.fr>
+Forwarded: no
+Last-Update: 2025-03-29
+
+Raise the source level to 1.8 as this is the minimum supported by the current
+default JDK (21).
+
+--- a/build.xml
++++ b/build.xml
+@@ -23,7 +23,7 @@
+
+ <!-- Compile the java code from ${src} into ${build} -->
+ <target name="compile" description="compile the source">
+- <javac source="1.4" srcdir="${source}" destdir="${build}" encoding="ISO-8859-1">
++ <javac source="1.8" srcdir="${source}" destdir="${build}" encoding="ISO-8859-1">
+ <classpath>
+ <fileset dir="${build}/lib">
+ <include name="*.jar"/>
=====================================
debian/patches/08_jfreechart_1_5_compatibility.diff
=====================================
@@ -0,0 +1,69 @@
+Description: Adjust to newer jfreechart API
+Author: Julien Plissonneau Duquène <sre4ever at free.fr>
+Bug-Debian: https://bugs.debian.org/1099222
+Forwarded: no
+Last-Update: 2025-03-29
+
+Some renaming and removals occured with newer releases of jfreechart.
+--- a/src/ca/spaz/cron/metrics/BiomarkerPanel.java
++++ b/src/ca/spaz/cron/metrics/BiomarkerPanel.java
+@@ -18,7 +18,7 @@
+ import org.jfree.chart.renderer.xy.XYItemRenderer;
+ import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
+ import org.jfree.data.time.*;
+-import org.jfree.ui.RectangleInsets;
++import org.jfree.chart.ui.RectangleInsets;
+
+ import ca.spaz.cron.user.UserManager;
+
+@@ -86,7 +86,7 @@
+ ///////////////////////////////////////////////////////////////////////////////////////////
+
+
+- private TimeSeries actualData = new TimeSeries("Weight", Minute.class);
++ private TimeSeries actualData = new TimeSeries("Weight"/*, Minute.class */);
+
+ private void regenerateGraphData() {
+ List metrics = UserManager.getCurrentUser().getBiometricsHistory().getMetricsOfType("Weight");
+@@ -130,8 +130,8 @@
+ XYItemRenderer r = plot.getRenderer();
+ if (r instanceof XYLineAndShapeRenderer) {
+ XYLineAndShapeRenderer renderer = (XYLineAndShapeRenderer) r;
+- renderer.setBaseShapesVisible(true);
+- renderer.setBaseShapesFilled(true);
++ renderer.setDefaultShapesVisible(true);
++ renderer.setDefaultShapesFilled(true);
+ }
+
+ DateAxis axis = (DateAxis) plot.getDomainAxis();
+--- a/src/ca/spaz/cron/metrics/MetricChart.java
++++ b/src/ca/spaz/cron/metrics/MetricChart.java
+@@ -19,7 +19,7 @@
+ import org.jfree.chart.renderer.xy.XYItemRenderer;
+ import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
+ import org.jfree.data.time.*;
+-import org.jfree.ui.RectangleInsets;
++import org.jfree.chart.ui.RectangleInsets;
+
+ import ca.spaz.cron.user.UserManager;
+ import ca.spaz.gui.DateChooser;
+@@ -78,7 +78,7 @@
+ * @return The dataset.
+ */
+ private void createDataset() {
+- actualData = new TimeSeries(metricName, Day.class);
++ actualData = new TimeSeries(metricName);
+ dataset = new TimeSeriesCollection();
+ getData();
+ dataset.addSeries(actualData);
+@@ -139,8 +139,8 @@
+ XYItemRenderer r = plot.getRenderer();
+ if (r instanceof XYLineAndShapeRenderer) {
+ XYLineAndShapeRenderer renderer = (XYLineAndShapeRenderer) r;
+- renderer.setBaseShapesVisible(true);
+- renderer.setBaseShapesFilled(true);
++ renderer.setDefaultShapesVisible(true);
++ renderer.setDefaultShapesFilled(true);
+ }
+
+ DateAxis axis = (DateAxis) plot.getDomainAxis();
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,5 @@
01_no_mswin_taskdefs.diff
05_dont_check_for_updates.diff
06_java9_compatibility.diff
+07_java21_compatibility.diff
+08_jfreechart_1_5_compatibility.diff
View it on GitLab: https://salsa.debian.org/java-team/cronometer/-/compare/cdcf90f3577989fce40eb82b061d27bb871c9f97...73cecc7b001a9f034ba4e3c3e28cb9bf03b1a310
--
View it on GitLab: https://salsa.debian.org/java-team/cronometer/-/compare/cdcf90f3577989fce40eb82b061d27bb871c9f97...73cecc7b001a9f034ba4e3c3e28cb9bf03b1a310
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-java-commits/attachments/20250329/b371ac83/attachment.htm>
More information about the pkg-java-commits
mailing list