Simon Quigley pushed to branch master at Debian Java Maintainers / latexdraw
Commits: 46f02085 by Stuart Prescott at 2023-09-26T11:03:06+00:00 Merge branch 'lintian-fixes' into 'master' Fix some issues reported by lintian See merge request java-team/latexdraw!2 - - - - - 38fbf0c2 by Juan Manuel Méndez Rey at 2026-10-02T02:43:41+02:00 Rebuild against Scala 2.12 - - - - - 22d08a08 by Juan Manuel Méndez Rey at 2026-10-03T06:55:15+02:00 Sort the source files given to scalac, for a reproducible build - - - - - 0253cc79 by Juan Manuel Méndez Rey at 2026-10-24T13:40:19+02:00 Merge master (3.3.9-1) into scala-2.12 - - - - - d7e569dc by Simon Quigley at 2026-10-28T19:42:23-05:00 Merge branch 'scala-2.12' into 'master' Rebuild against Scala 2.12 See merge request java-team/latexdraw!3 - - - - - 6 changed files: - debian/changelog - debian/control - debian/maven.rules - + debian/patches/scala-2.12-wrapper.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +latexdraw (3.3.9-2) UNRELEASED; urgency=medium + + * Team upload. + * Build and run with Scala 2.12 and scala-parser-combinators-2.12 + (#1142168). + + -- Juan Manuel Méndez Rey <[email protected]> Sat, 24 Oct 2026 12:00:00 +0200 + latexdraw (3.3.9-1) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -10,7 +10,8 @@ Build-Depends-Indep: libjlibeps-java, libpdfrenderer-java, libmalai-java, - scala, + scala (>= 2.12~), + scala-parser-combinators-2.12, junit4, Standards-Version: 4.7.4 Homepage: https://latexdraw.sourceforge.net/ @@ -25,8 +26,8 @@ Depends: libjlibeps-java, libmalai-java, libpdfrenderer-java, - scala-library, - scala-parser-combinators, + scala-library (>= 2.12~), + scala-parser-combinators-2.12, ${maven:Depends}, ${misc:Depends} Recommends: ===================================== debian/maven.rules ===================================== @@ -1,3 +1,4 @@ junit junit jar s/4\..*/4.x/ * * -org.scala-lang * * s/2\.11.*/2.11.x/ * * +org.scala-lang * * s/2\.1[12].*/2.12.x/ * * +org.scala-lang.modules s/scala-parser-combinators_2\.11/scala-parser-combinators_2.12/ * s/.*/debian/ * * ===================================== debian/patches/scala-2.12-wrapper.patch ===================================== @@ -0,0 +1,29 @@ +From: =?utf-8?q?Juan_Manuel_M=C3=A9ndez_Rey?= <[email protected]> +Date: Fri, 2 Oct 2026 02:42:54 +0200 +Subject: Use the Scala 2.12 jars in the latexdraw wrapper + +latexdraw is now built with Scala 2.12, so the wrapper must load the 2.12 +standard library and scala-parser-combinators_2.12 (the jars of one Scala +series are not binary compatible with another). + +Forwarded: not-needed +Last-Update: 2026-10-02 +--- + latexdraw | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/latexdraw b/latexdraw +index eba1a2d..bcbf836 100644 +--- a/latexdraw ++++ b/latexdraw +@@ -14,8 +14,8 @@ find_java_runtime sun6 openjdk + find_jars \ + latexdraw.core \ + net.sourceforge.jlibeps \ +- scala-library \ +- scala-parser-combinators \ ++ scala-library-2.12 \ ++ scala-parser-combinators_2.12 \ + malai.core \ + malai.swing + ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ local-jars.patch latexdraw_shell_script.patch top-pom.patch +scala-2.12-wrapper.patch ===================================== debian/rules ===================================== @@ -14,7 +14,8 @@ override_dh_auto_build: CLASSPATH=.:\ /usr/share/java/malai.core.jar:\ /usr/share/java/malai.swing.jar:\ - /usr/share/java/pdfrenderer.jar \ + /usr/share/java/pdfrenderer.jar:\ + /usr/share/java/scala-parser-combinators_2.12.jar \ scalac \ -d target/classes \ `find -name \*.scala -type f | LC_ALL=C sort` \ View it on GitLab: https://salsa.debian.org/java-team/latexdraw/-/compare/a31dd87b0c1f1266b96d52883a649809b18059e2...d7e569dce5e7c87e4d178eec85b9d51d482efdaf -- View it on GitLab: https://salsa.debian.org/java-team/latexdraw/-/compare/a31dd87b0c1f1266b96d52883a649809b18059e2...d7e569dce5e7c87e4d178eec85b9d51d482efdaf You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits

