[med-svn] [Git][med-team/jmodeltest][master] 6 commits: Fixing build failure due to ABI breakage in jfreechart

[Pierre Gruet (@pgt)]

Pierre Gruet pushed to branch master at Debian Med / jmodeltest


Commits:
f29ca82b by Pierre Gruet at 2025-12-07T15:43:08+01:00
Fixing build failure due to ABI breakage in jfreechart

- - - - -
184f7e92 by Pierre Gruet at 2025-12-07T15:43:28+01:00
Raising Standards version to 4.7.2 (no change)

- - - - -
b2e25664 by Pierre Gruet at 2025-12-07T15:44:02+01:00
Rewriting d/watch with version 5

- - - - -
b43d0492 by Pierre Gruet at 2025-12-07T15:46:07+01:00
Fixing URI in d/u/metadata

- - - - -
e9ade1b7 by Pierre Gruet at 2025-12-07T15:48:06+01:00
Updating changelog

- - - - -
1937c625 by Pierre Gruet at 2025-12-07T15:48:17+01:00
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/control
- + debian/patches/libjfreechart-java-1.5.patch
- debian/patches/series
- debian/upstream/metadata
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+jmodeltest (2.1.10+dfsg-13) unstable; urgency=medium
+
+  * Team upload.
+  * Fixing build failure due to ABI breakage in jfreechart (Closes: #1099239)
+  * Raising Standards version to 4.7.2 (no change)
+  * Rewriting d/watch with version 5
+  * Fixing URI in d/u/metadata
+
+ -- Pierre Gruet <pgt at debian.org>  Sun, 07 Dec 2025 15:48:08 +0100
+
 jmodeltest (2.1.10+dfsg-12) unstable; urgency=medium
 
   * Fix watch file


=====================================
debian/control
=====================================
@@ -18,7 +18,7 @@ Build-Depends: debhelper-compat (= 13),
                texlive-fonts-recommended,
                texlive-latex-recommended,
                texlive-latex-extra
-Standards-Version: 4.6.1
+Standards-Version: 4.7.2
 Vcs-Browser: https://salsa.debian.org/med-team/jmodeltest
 Vcs-Git: https://salsa.debian.org/med-team/jmodeltest.git
 Homepage: https://github.com//ddarriba/jmodeltest2


=====================================
debian/patches/libjfreechart-java-1.5.patch
=====================================
@@ -0,0 +1,31 @@
+Description: class ChartUtilitie has been moved to ChartUtils in
+ libjfreechart-java 1.5.x
+Author: Pierre Gruet <pgt at debian.org>
+Bug-Debian: https://bugs.debian.org/1099239
+Forwarded: no
+Last-Update: 2025-12-07
+
+--- a/src/main/java/es/uvigo/darwin/jmodeltest/io/HtmlReporter.java
++++ b/src/main/java/es/uvigo/darwin/jmodeltest/io/HtmlReporter.java
+@@ -35,7 +35,7 @@
+ import java.util.Locale;
+ import java.util.Map;
+ 
+-import org.jfree.chart.ChartUtilities;
++import org.jfree.chart.ChartUtils;
+ 
+ import pal.tree.Tree;
+ import es.uvigo.darwin.jmodeltest.ApplicationOptions;
+@@ -649,10 +649,10 @@
+ 			if (!IMAGES_DIR.exists()) {
+ 				IMAGES_DIR.mkdir();
+ 			}
+-			ChartUtilities.saveChartAsPNG(new File(IMAGES_DIR.getPath() + File.separator + mOutputFile.getName() + "_rf_" + ic + ".png"), 
++			ChartUtils.saveChartAsPNG(new File(IMAGES_DIR.getPath() + File.separator + mOutputFile.getName() + "_rf_" + ic + ".png"),
+ 					RFHistogram.buildRFHistogram(ic),
+ 					width, height);
+-			ChartUtilities.saveChartAsPNG(new File(IMAGES_DIR.getPath() + File.separator + mOutputFile.getName() + "_eu_" + ic + ".png"), 
++			ChartUtils.saveChartAsPNG(new File(IMAGES_DIR.getPath() + File.separator + mOutputFile.getName() + "_eu_" + ic + ".png"),
+ 					RFHistogram.buildEuclideanHistogram(ic),
+ 					width, height);
+ 		} catch (IOException e) {


=====================================
debian/patches/series
=====================================
@@ -6,3 +6,4 @@ remove_BrowserLauncher_reference.patch
 latex_encoding.patch
 fix_alter-lib.patch
 reproducible_build.patch
+libjfreechart-java-1.5.patch


=====================================
debian/upstream/metadata
=====================================
@@ -19,4 +19,7 @@ Registry:
    Entry: NA
  - Name: SciCrunch
    Entry: SCR_015244
-Repository-Browse: https://github.com//ddarriba
+Bug-Database: https://github.com/ddarriba/jmodeltest2/issues
+Bug-Submit: https://github.com/ddarriba/jmodeltest2/issues/new
+Repository: https://github.com/ddarriba/jmodeltest2.git
+Repository-Browse: https://github.com/ddarriba/jmodeltest2


=====================================
debian/watch
=====================================
@@ -1,4 +1,7 @@
-version=4
+Version: 5
 
-opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz%" \
-  https://github.com//ddarriba/jmodeltest2/tags .*/[jModelTst-v]*(\d[\d.-]+)r[0-9]+\.(?:tar(?:\.gz|\.bz2)?|tgz)
+Source: https://github.com//ddarriba/jmodeltest2/tags
+Matching-Pattern: .*/[jModelTst-v]*(\d[\d.-]+)r[0-9]+\.(?:tar(?:\.gz|\.bz2)?|tgz)
+Dversionmangle: s/\+dfsg//g
+Filenamemangle: s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz%
+Repacksuffix: +dfsg



View it on GitLab: https://salsa.debian.org/med-team/jmodeltest/-/compare/89477a230fa3489b1a2a291744a9b3d9c59f9907...1937c625d0e2fa83d8d1d9bfe7e4722f0007d3b4

-- 
View it on GitLab: https://salsa.debian.org/med-team/jmodeltest/-/compare/89477a230fa3489b1a2a291744a9b3d9c59f9907...1937c625d0e2fa83d8d1d9bfe7e4722f0007d3b4
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/20251207/c479d5a1/attachment-0001.htm>