Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock X-Debbugs-Cc: sci...@packages.debian.org Control: affects -1 + src:scilab
Dear Release Team, Could you please unblock the key package scilab/6.1.1+dfsg2-5? [ Reason ] - scilab/6.1.1+dfsg2-4 is absolutely unusable as it cannot even start. - It FTBFS. - It looks for versioned artifacts so it breaks everytime a dependency is updated. [ Impact ] Staying with version 6.1.1+dfsg2-4 does not allow one to use scilab even in the naked CLI flavor. [ Tests ] I installed the version 6.1.1+dfsg2-5 on a Bookworm system: - scilab-cli and scilab-adv-cli work plainly, except for plots (bugs in dependencies); - the GUI scilab does not work. Blockers: bugs in dependency libjogl2-java and others still to investigate, as log messages are terse. [ Risks ] The changes are simple, can be easily grasped through the documented patches I added. scilab has only one reverse dependency which is not a Blends metapackage: cantor-backend-scilab, which is already broken as scilab/6.1.1+dfsg2-4 does not start. [ Checklist ] [X] all changes are documented in the d/changelog [X] I reviewed all changes and I approve them [X] attach debdiff against the package in testing unblock scilab/6.1.1+dfsg2-5 Best, -- Pierre
diff -Nru scilab-6.1.1+dfsg2/debian/changelog scilab-6.1.1+dfsg2/debian/changelog --- scilab-6.1.1+dfsg2/debian/changelog 2022-08-16 11:55:44.000000000 +0200 +++ scilab-6.1.1+dfsg2/debian/changelog 2023-03-11 16:23:07.000000000 +0100 @@ -1,3 +1,25 @@ +scilab (6.1.1+dfsg2-5) unstable; urgency=medium + + * Team upload + * Raising Standards version to 4.6.2 (no change) + * Adding missing dependencies on libfreehep-graphicsio-java and + libfreehep-util-java + * Fixing the FTBFS occurring during the doc build + * Enabling starting with OpenJDK 17 (Closes: #1012099) + * Selecting unversioned jars instead of versioned ones in the configure phase + (Closes: #1030205) + * Refreshing patches + * Removing unneeded older-than versioned dependencies + * Update lintian override info to new format: + + debian/source/lintian-overrides: line 2, 4 + + debian/scilab-minimal-bin.lintian-overrides: line 4 + * debian/copyright: use spaces rather than tabs to start continuation lines. + * Update renamed lintian tag names in lintian overrides. + * Set upstream metadata fields: Repository-Browse. + * Fix day-of-week for changelog entry 5.0.3-1. + + -- Pierre Gruet <p...@debian.org> Sat, 11 Mar 2023 16:23:07 +0100 + scilab (6.1.1+dfsg2-4) unstable; urgency=medium * Add patch to disambiguate pause (Closes: #1017283). @@ -1348,7 +1370,7 @@ * Package moved to main since Scilab is free (CeCILL license) * modelicac, intersci and scilab manpages added - -- Sylvestre Ledru <sylvestre.le...@inria.fr> Fri, 1 Oct 2008 13:37:08 +0200 + -- Sylvestre Ledru <sylvestre.le...@inria.fr> Wed, 01 Oct 2008 13:37:08 +0200 scilab (4.1.2-6) unstable; urgency=low diff -Nru scilab-6.1.1+dfsg2/debian/control scilab-6.1.1+dfsg2/debian/control --- scilab-6.1.1+dfsg2/debian/control 2022-08-16 11:55:44.000000000 +0200 +++ scilab-6.1.1+dfsg2/debian/control 2023-03-10 23:21:05.000000000 +0100 @@ -3,38 +3,36 @@ Priority: optional Maintainer: Debian Science Team <debian-science-maintain...@alioth-lists.debian.net> Uploaders: Julien Puydt <jpu...@debian.org> -Build-Depends: debhelper-compat (= 13), gfortran, time, - default-jdk, chrpath, ocaml-nox (>= 3.11.2-3), libnum-ocaml-dev, fakeroot, - tcl-dev, tk-dev, libxml2-dev, libpcre3-dev, libcurl4-openssl-dev, - gettext, libreadline-dev, pkg-config, procps, dpkg-dev (>= 1.16.0), +Build-Depends: debhelper-compat (= 13), gfortran, time, default-jdk, chrpath, + ocaml-nox, libnum-ocaml-dev, fakeroot, tcl-dev, tk-dev, libxml2-dev, + libpcre3-dev, libcurl4-openssl-dev, gettext, libreadline-dev, pkg-config, + procps, dpkg-dev, # numerical libraries libblas-dev | librefblas3-dev | libatlas-base-dev, liblapack-dev, - libarpack2-dev (>= 3.0), libeigen3-dev, + libarpack2-dev, libeigen3-dev, # Java deps - default-jre-headless, libflexdock-java (>= 1.2.3), libjogl2-java (>= 2.3.2), - libgl1-mesa-dev, libjrosetta-java (>= 1.0.1), ant, libjgoodies-looks-java, - libskinlf-java, liblucene4.10-java, libactivation-java, libjaxb-java, + default-jre-headless, libflexdock-java, libjogl2-java, libgl1-mesa-dev, + libjrosetta-java, ant, libjgoodies-looks-java, libskinlf-java, + liblucene4.10-java, libactivation-java, libjaxb-java, # graphic - libfreehep-graphics2d-java, libfreehep-graphicsio-java, libfreehep-graphicsio-emf-java, - libfreehep-util-java, + libfreehep-graphics2d-java, libfreehep-graphicsio-java, + libfreehep-graphicsio-emf-java, libfreehep-util-java, # Documentation - libjeuclid-core-java (>= 3.1.3), libbatik-java (>= 1.7), fop (>= 0.95), - javahelp2, libsaxon-java, libavalon-framework-java, docbook-xsl, - libxml-commons-external-java, + libjeuclid-core-java, libbatik-java, fop, javahelp2, libsaxon-java, + libavalon-framework-java, docbook-xsl, libxml-commons-external-java, # Optional Scilab features - libfftw3-dev, libsuitesparse-dev (>= 3.4.0), - libmatio-dev (>= 1.5.18), + libfftw3-dev, libsuitesparse-dev, libmatio-dev (>= 1.5.18), # latex rendering - libjlatexmath-java (>= 1.0.2), libjlatexmath-fop-java (>= 1.0.2), + libjlatexmath-java, libjlatexmath-fop-java, # Xcos - libjgraphx-java (>= 1.8.0.0), libhdf5-dev (>= 1.8.8), + libjgraphx-java, libhdf5-dev, # MPI mpi-default-dev, # Java binding libecj-java, # Unitary testing ant-optional, junit4, libcobertura-java -Standards-Version: 4.6.0 +Standards-Version: 4.6.2 Rules-Requires-Root: no Homepage: https://www.scilab.org Vcs-Git: https://salsa.debian.org/science-team/scilab.git @@ -157,13 +155,14 @@ Package: scilab-full-bin Architecture: amd64 armhf i386 powerpc s390x arm64 ppc64el Depends: ${shlibs:Depends}, scilab-minimal-bin (= ${binary:Version}), - libflexdock-java (>= 1.2.3), libjogl2-java (>= 2.3.2), libjrosetta-java (>= 1.0.1), - libjlatexmath-java (>= 1.0.2), libjlatexmath-fop-java (>= 1.0.2), - libjeuclid-core-java, libbatik-java (>= 1.7), default-jre, bwidget, - fop (>= 0.95), libsaxon-java, libavalon-framework-java, docbook-xsl, - javahelp2, libjgraphx-java (>= 1.8.0.0), libjgoodies-looks-java, + libflexdock-java, libjogl2-java, libjrosetta-java, + libjlatexmath-java, libjlatexmath-fop-java, + libjeuclid-core-java, libbatik-java, default-jre, bwidget, + fop, libsaxon-java, libavalon-framework-java, docbook-xsl, + javahelp2, libjgraphx-java, libjgoodies-looks-java, libskinlf-java, ${misc:Depends}, libecj-java, libfreehep-graphics2d-java, - libfreehep-graphicsio-emf-java, liblucene4.10-java, libactivation-java, + libfreehep-graphicsio-java, libfreehep-graphicsio-emf-java, + libfreehep-util-java, liblucene4.10-java, libactivation-java, libjaxb-java Replaces: scilab (<< 5.0), scilab-bin, scilab-minimal-bin (<< 5.4.1-3), libscilab2-java (<< 5.4.1-4) Breaks: scilab-minimal-bin (<< 5.4.1-3), libscilab2-java (<< 5.4.1-4) diff -Nru scilab-6.1.1+dfsg2/debian/copyright scilab-6.1.1+dfsg2/debian/copyright --- scilab-6.1.1+dfsg2/debian/copyright 2022-08-16 11:55:44.000000000 +0200 +++ scilab-6.1.1+dfsg2/debian/copyright 2023-03-10 23:21:08.000000000 +0100 @@ -6,16 +6,16 @@ Files: * Copyright: 1989-2008 INRIA - 1989-2007 ENPC - 2008-2012 DIGITEO - 2012-2016 Scilab Enterprises - 2017-2018 ESI Group + 1989-2007 ENPC + 2008-2012 DIGITEO + 2012-2016 Scilab Enterprises + 2017-2018 ESI Group License: GPL-2+ Files: debian/* Copyright: Torsten Werner <twer...@debian.org> Sylvestre Ledru <sylvestre.le...@inria.fr> - Julien Puydt <jpu...@debian.org> + Julien Puydt <jpu...@debian.org> License: GPL-2+ License: GPL-2+ diff -Nru scilab-6.1.1+dfsg2/debian/patches/fixing_doc_build.patch scilab-6.1.1+dfsg2/debian/patches/fixing_doc_build.patch --- scilab-6.1.1+dfsg2/debian/patches/fixing_doc_build.patch 1970-01-01 01:00:00.000000000 +0100 +++ scilab-6.1.1+dfsg2/debian/patches/fixing_doc_build.patch 2023-03-10 23:02:29.000000000 +0100 @@ -0,0 +1,49 @@ +Description: fixing the build of the doc by skipping the Japanese part, + including the shared libs in the modules in java.library.path and also loading + the native libraries in a clean, non-reflective way. +Author: Pierre Gruet <p...@debian.org> +Forwarded: no +Last-Update: 2023-03-10 + +--- a/scilab/modules/jvm/src/java/org/scilab/modules/jvm/LibraryPath.java ++++ b/scilab/modules/jvm/src/java/org/scilab/modules/jvm/LibraryPath.java +@@ -66,7 +66,7 @@ + /* The order matter here... see bug #4022 */ + String newLibPath = System.getProperty(JAVALIBRARYPATH) + File.pathSeparator + p; + System.setProperty(JAVALIBRARYPATH, newLibPath); +- // First try the new initLibraryPaths method ++ /*// First try the new initLibraryPaths method + try { + final Method initLibraryPaths = ClassLoader.class.getDeclaredMethod("initLibraryPaths"); + initLibraryPaths.setAccessible(true); +@@ -87,7 +87,7 @@ + throw new IOException("Error InvocationTargetException, could not add path to " + JAVALIBRARYPATH); + } catch (IllegalAccessException e) { + throw new IOException("Error IllegalAccessException, could not add path to " + JAVALIBRARYPATH); +- } ++ }*/ + } + } + +--- a/scilab/Makefile.am ++++ b/scilab/Makefile.am +@@ -306,7 +306,7 @@ + LANG=$$l.UTF-8 SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 _JAVA_OPTIONS='-Djava.awt.headless=true' HOME=/tmp $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e "$$COMMAND" || exit 1;\ + else \ + echo "LANG=$$l.UTF-8 LC_ALL=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 _JAVA_OPTIONS='-Djava.awt.headless=true' HOME=/tmp $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e \"$$COMMAND\"";\ +- LANG=$$l.UTF-8 LC_ALL=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 _JAVA_OPTIONS='-Djava.awt.headless=true' HOME=/tmp $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e "$$COMMAND" || exit 1;\ ++ LANG=$$l.UTF-8 LC_ALL=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 _JAVA_OPTIONS="-Djava.awt.headless=true -Djava.library.path=/usr/lib/jni:$$(find . -name "*.so" -a -wholename "*modules*" | sed 's/\/[^/]*$$//' | sort | uniq | tr '\n' ':' | sed 's/:$$//')" HOME=/tmp $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e "$$COMMAND" || exit 1;\ + fi; \ + done; \ + else \ +--- a/scilab/configure.ac ++++ b/scilab/configure.ac +@@ -1537,7 +1537,7 @@ + ####################### + + ALL_LINGUAS="en_US fr_FR zh_CN zh_TW ru_RU ca_ES de_DE es_ES pt_BR ja_JP it_IT uk_UA pl_PL cs_CZ" +-ALL_LINGUAS_DOC="en_US fr_FR pt_BR ja_JP ru_RU" ++ALL_LINGUAS_DOC="en_US fr_FR pt_BR ja_JP" + + AC_ARG_ENABLE(build-localization, + AS_HELP_STRING([--disable-build-localization],[Disable the localization build]) diff -Nru scilab-6.1.1+dfsg2/debian/patches/force-fop-jar-into-classpath.patch scilab-6.1.1+dfsg2/debian/patches/force-fop-jar-into-classpath.patch --- scilab-6.1.1+dfsg2/debian/patches/force-fop-jar-into-classpath.patch 2022-08-16 11:55:44.000000000 +0200 +++ scilab-6.1.1+dfsg2/debian/patches/force-fop-jar-into-classpath.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -Description: Workaround for bug #915102 where AC_JAVA_CHECK_JAR picks up - one of the fop-<subset>.jar instead of fop.jar -Author: Gilles Filippini <p...@debian.org> -Bug-Debian: https://bugs.debian.org/915102 -Forwarded: Debian-specific - ---- scilab.orig/scilab/configure.ac -+++ scilab/scilab/configure.ac -@@ -1059,7 +1059,9 @@ - - ################ Mandatory for graphic_export features ##### - # XML to PDF/other Translator -- AC_JAVA_CHECK_JAR([fop],[org.apache.fop.pdf.PDFInfo],[XML to PDF Translator (fop)]) -+ #AC_JAVA_CHECK_JAR([fop],[org.apache.fop.pdf.PDFInfo],[XML to PDF Translator (fop)]) -+ PACKAGE_JAR_FILE=/usr/share/java/fop.jar -+ ac_java_classpath=$ac_java_classpath:$PACKAGE_JAR_FILE - FOP=$PACKAGE_JAR_FILE - AC_SUBST(FOP) - diff -Nru scilab-6.1.1+dfsg2/debian/patches/libjogl2-java-2.3.2.diff scilab-6.1.1+dfsg2/debian/patches/libjogl2-java-2.3.2.diff --- scilab-6.1.1+dfsg2/debian/patches/libjogl2-java-2.3.2.diff 2022-08-16 11:55:44.000000000 +0200 +++ scilab-6.1.1+dfsg2/debian/patches/libjogl2-java-2.3.2.diff 2023-03-10 22:52:42.000000000 +0100 @@ -3,9 +3,9 @@ Author: Gilles Filippini <p...@debian.org> Forwarded: http://bugzilla.scilab.org/show_bug.cgi?id=13809 ---- scilab.orig/scilab/configure.ac -+++ scilab/scilab/configure.ac -@@ -952,7 +952,7 @@ +--- a/scilab/configure.ac ++++ b/scilab/configure.ac +@@ -963,7 +963,7 @@ AC_SUBST(SKINLF) # JOGL 2 @@ -14,7 +14,7 @@ JOGL2=$PACKAGE_JAR_FILE AC_SUBST(JOGL2) -@@ -981,7 +981,7 @@ +@@ -992,7 +992,7 @@ fi # JoGL Native <=> Java connector @@ -23,8 +23,8 @@ GLUEGEN2_RT=$PACKAGE_JAR_FILE AC_SUBST(GLUEGEN2_RT) ---- scilab.orig/scilab/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java -+++ scilab/scilab/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java +--- a/scilab/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java ++++ b/scilab/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java @@ -13,8 +13,8 @@ import org.scilab.forge.scirenderer.tranformations.TransformationFactory; import org.scilab.forge.scirenderer.utils.shapes.geometry.CubeFactory; @@ -36,8 +36,8 @@ import javax.swing.*; import java.awt.*; ---- scilab.orig/scilab/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java -+++ scilab/scilab/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java +--- a/scilab/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java ++++ b/scilab/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java @@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.Canvas; import org.scilab.forge.scirenderer.implementation.jogl.JoGLCanvasFactory; @@ -47,8 +47,8 @@ import javax.swing.JFrame; import javax.swing.JPanel; import java.awt.BorderLayout; ---- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java -+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java @@ -20,17 +20,17 @@ import java.lang.reflect.InvocationTargetException; import java.util.concurrent.Semaphore; @@ -78,8 +78,8 @@ import javax.swing.SwingUtilities; import org.scilab.forge.scirenderer.Canvas; ---- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java -+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java @@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.Canvas; @@ -89,8 +89,8 @@ /** * @author Pierre Lando ---- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java -+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java @@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.implementation.jogl; @@ -100,8 +100,8 @@ /** * This class store current OpenGl context capacity. ---- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java -+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java @@ -34,7 +34,7 @@ import org.scilab.forge.scirenderer.tranformations.TransformationManagerListener; import org.scilab.forge.scirenderer.tranformations.Vector3d; @@ -111,8 +111,8 @@ /** * ---- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java -+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java @@ -14,8 +14,8 @@ package org.scilab.forge.scirenderer.implementation.jogl; @@ -124,8 +124,8 @@ /** * @author Pierre Lando ---- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java -+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java @@ -19,7 +19,7 @@ import org.scilab.forge.scirenderer.buffers.ElementsBuffer; import org.scilab.forge.scirenderer.buffers.IndicesBuffer; @@ -135,8 +135,8 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; ---- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java -+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java @@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.buffers.DataBuffer; @@ -146,8 +146,8 @@ import java.nio.Buffer; /** ---- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java -+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java @@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.buffers.ElementsBuffer; @@ -157,8 +157,8 @@ import java.nio.Buffer; import java.nio.FloatBuffer; ---- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java -+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java @@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.buffers.IndicesBuffer; @@ -168,8 +168,8 @@ import java.nio.Buffer; import java.nio.IntBuffer; import java.util.Collection; ---- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java -+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java @@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.clipping.ClippingPlane; import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools; @@ -179,8 +179,8 @@ /** * @author Pierre Lando ---- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java -+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java @@ -20,7 +20,7 @@ import org.scilab.forge.scirenderer.tranformations.TransformationFactory; import org.scilab.forge.scirenderer.tranformations.Vector4d; @@ -190,8 +190,8 @@ /** * @author Pierre Lando ---- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java -+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java @@ -26,7 +26,7 @@ import org.scilab.forge.scirenderer.lightning.LightManager; import org.scilab.forge.scirenderer.shapes.appearance.Material; @@ -201,8 +201,8 @@ import java.nio.FloatBuffer; import java.nio.IntBuffer; ---- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java -+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java @@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.lightning; @@ -212,8 +212,8 @@ import org.scilab.forge.scirenderer.implementation.jogl.utils.GLShortCuts; import org.scilab.forge.scirenderer.lightning.Light; ---- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java -+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java @@ -20,7 +20,7 @@ import org.scilab.forge.scirenderer.lightning.LightManager; import org.scilab.forge.scirenderer.shapes.appearance.Material; @@ -223,8 +223,8 @@ /** * JoGL implementation of {@link LightManager} ---- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java -+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java @@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.picking; @@ -234,8 +234,8 @@ /** * @author Pierre Lando ---- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java -+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java @@ -19,7 +19,7 @@ import org.scilab.forge.scirenderer.picking.PickingTools; import org.scilab.forge.scirenderer.tranformations.Vector3d; @@ -245,8 +245,8 @@ import java.awt.Point; import java.nio.FloatBuffer; ---- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java -+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java @@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools; import org.scilab.forge.scirenderer.renderer.Renderer; @@ -256,8 +256,8 @@ /** * @author Pierre Lando ---- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java -+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java @@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.renderer.Renderer; import org.scilab.forge.scirenderer.renderer.RendererManager; @@ -267,8 +267,8 @@ import java.util.HashSet; import java.util.Set; import java.util.Stack; ---- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java -+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java @@ -32,11 +32,11 @@ import org.scilab.forge.scirenderer.tranformations.Vector3d; @@ -286,8 +286,8 @@ import java.awt.Dimension; import java.nio.ByteBuffer; import java.nio.FloatBuffer; ---- scilab.orig/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java -+++ scilab/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java +--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java ++++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java @@ -17,7 +17,7 @@ import org.scilab.forge.scirenderer.shapes.appearance.Appearance; import org.scilab.forge.scirenderer.shapes.appearance.Color; @@ -297,8 +297,8 @@ /** * ---- scilab.orig/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java -+++ scilab/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java +--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java ++++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java @@ -88,10 +88,10 @@ import java.util.Set; import java.util.UUID; @@ -314,8 +314,8 @@ import javax.swing.JComponent; import javax.swing.JSeparator; import javax.swing.SwingUtilities; ---- scilab.orig/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java -+++ scilab/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java +--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java ++++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java @@ -23,7 +23,7 @@ import java.awt.Font; import java.awt.image.BufferedImage; @@ -325,8 +325,8 @@ import org.scilab.modules.gui.canvas.Canvas; import org.scilab.modules.gui.canvas.ScilabCanvas; ---- scilab.orig/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java -+++ scilab/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java +--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java ++++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java @@ -35,8 +35,8 @@ import java.awt.event.MouseMotionListener; import java.awt.image.BufferedImage; @@ -338,8 +338,8 @@ import javax.swing.JPanel; import org.scilab.forge.scirenderer.Canvas; ---- scilab.orig/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java -+++ scilab/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java +--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java ++++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java @@ -22,12 +22,12 @@ import java.util.Calendar; import java.util.StringTokenizer; @@ -359,8 +359,8 @@ import org.scilab.modules.action_binding.InterpreterManagement; import org.scilab.modules.commons.OS; ---- scilab.orig/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java -+++ scilab/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java +--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java ++++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java @@ -17,7 +17,7 @@ import java.awt.image.BufferedImage; @@ -370,8 +370,8 @@ import org.scilab.modules.gui.dockable.Dockable; ---- scilab.orig/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java -+++ scilab/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java +--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java ++++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java @@ -19,7 +19,7 @@ import java.awt.image.BufferedImage; @@ -381,8 +381,8 @@ import org.scilab.modules.gui.bridge.ScilabBridge; import org.scilab.modules.gui.dockable.ScilabDockable; ---- scilab.orig/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java -+++ scilab/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java +--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java ++++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java @@ -17,7 +17,7 @@ import java.awt.image.BufferedImage; @@ -392,8 +392,8 @@ import org.scilab.modules.gui.bridge.canvas.SwingScilabCanvas; import org.scilab.modules.gui.utils.Position; ---- scilab.orig/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java -+++ scilab/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java +--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java ++++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java @@ -18,7 +18,7 @@ import org.scilab.modules.gui.utils.Position; import org.scilab.modules.gui.utils.Size; diff -Nru scilab-6.1.1+dfsg2/debian/patches/no_more_xml2_config.patch scilab-6.1.1+dfsg2/debian/patches/no_more_xml2_config.patch --- scilab-6.1.1+dfsg2/debian/patches/no_more_xml2_config.patch 2022-08-16 11:55:44.000000000 +0200 +++ scilab-6.1.1+dfsg2/debian/patches/no_more_xml2_config.patch 2023-03-10 22:47:19.000000000 +0100 @@ -2,9 +2,9 @@ Author: Julien Puydt Forwarded: http://bugzilla.scilab.org/show_bug.cgi?id=16352 ---- scilab.orig/scilab/configure.ac -+++ scilab/scilab/configure.ac -@@ -1530,7 +1530,9 @@ +--- a/scilab/configure.ac ++++ b/scilab/configure.ac +@@ -1528,7 +1528,9 @@ ## Test for libxml ####################### @@ -15,7 +15,7 @@ ####################### ## Test for gettext -@@ -2398,9 +2400,8 @@ +@@ -2396,9 +2398,8 @@ echo "" echo "XML configuration:" @@ -26,8 +26,8 @@ echo "" echo "HDF5 configuration:" ---- scilab.orig/scilab/modules/completion/Makefile.am -+++ scilab/scilab/modules/completion/Makefile.am +--- a/scilab/modules/completion/Makefile.am ++++ b/scilab/modules/completion/Makefile.am @@ -77,7 +77,7 @@ -I$(top_srcdir)/modules/dynamic_link/includes \ -I$(top_srcdir)/modules/external_objects/includes \ @@ -37,8 +37,8 @@ $(AM_CPPFLAGS) # Name of the future library (.la will be replace by .so, .a, etc regarding ---- scilab.orig/scilab/modules/core/Makefile.am -+++ scilab/scilab/modules/core/Makefile.am +--- a/scilab/modules/core/Makefile.am ++++ b/scilab/modules/core/Makefile.am @@ -188,7 +188,7 @@ -I$(top_srcdir)/modules/fftw/includes/ \ -I$(top_srcdir)/modules/ui_data/includes/ \ @@ -48,8 +48,8 @@ $(AM_CPPFLAGS) # Used by sci_getdebuginfo: ---- scilab.orig/scilab/modules/coverage/Makefile.am -+++ scilab/scilab/modules/coverage/Makefile.am +--- a/scilab/modules/coverage/Makefile.am ++++ b/scilab/modules/coverage/Makefile.am @@ -67,7 +67,7 @@ -I$(top_srcdir)/modules/string/includes/ \ -I$(top_srcdir)/modules/dynamic_link/includes \ @@ -59,8 +59,8 @@ $(COVERAGE_FLAGS) \ $(AM_CPPFLAGS) ---- scilab.orig/scilab/modules/fileio/Makefile.am -+++ scilab/scilab/modules/fileio/Makefile.am +--- a/scilab/modules/fileio/Makefile.am ++++ b/scilab/modules/fileio/Makefile.am @@ -134,7 +134,7 @@ -I$(top_srcdir)/modules/dynamic_link/includes \ -I$(top_srcdir)/modules/preferences/includes \ @@ -70,8 +70,8 @@ $(CURL_CFLAGS) \ $(AM_CPPFLAGS) ---- scilab.orig/scilab/modules/functions_manager/Makefile.am -+++ scilab/scilab/modules/functions_manager/Makefile.am +--- a/scilab/modules/functions_manager/Makefile.am ++++ b/scilab/modules/functions_manager/Makefile.am @@ -46,7 +46,7 @@ -I$(top_srcdir)/modules/string/includes/ \ -I$(top_srcdir)/modules/threads/includes/ \ @@ -81,8 +81,8 @@ libscifunctions_manager_la_includedir=$(pkgincludedir) ---- scilab.orig/scilab/modules/io/Makefile.am -+++ scilab/scilab/modules/io/Makefile.am +--- a/scilab/modules/io/Makefile.am ++++ b/scilab/modules/io/Makefile.am @@ -61,7 +61,7 @@ -I$(top_srcdir)/modules/console/includes \ -I$(top_srcdir)/modules/hdf5/includes \ @@ -92,8 +92,8 @@ $(AM_CPPFLAGS) if MAINTAINER_MODE ---- scilab.orig/scilab/modules/jvm/Makefile.am -+++ scilab/scilab/modules/jvm/Makefile.am +--- a/scilab/modules/jvm/Makefile.am ++++ b/scilab/modules/jvm/Makefile.am @@ -51,7 +51,7 @@ -I$(top_srcdir)/modules/fileio/includes/ \ -I$(top_srcdir)/modules/dynamic_link/includes \ @@ -103,8 +103,8 @@ $(AM_CPPFLAGS) pkglib_LTLIBRARIES = libscijvm-disable.la ---- scilab.orig/scilab/modules/preferences/Makefile.am -+++ scilab/scilab/modules/preferences/Makefile.am +--- a/scilab/modules/preferences/Makefile.am ++++ b/scilab/modules/preferences/Makefile.am @@ -64,7 +64,7 @@ -I$(srcdir)/includes/ \ -I$(srcdir)/src/c/ \ @@ -114,8 +114,8 @@ -I$(top_srcdir)/modules/ast/includes/ast/ \ -I$(top_srcdir)/modules/ast/includes/analysis/ \ -I$(top_srcdir)/modules/ast/includes/exps/ \ ---- scilab.orig/scilab/modules/scicos/Makefile.am -+++ scilab/scilab/modules/scicos/Makefile.am +--- a/scilab/modules/scicos/Makefile.am ++++ b/scilab/modules/scicos/Makefile.am @@ -155,13 +155,13 @@ -I$(top_srcdir)/modules/threads/includes/ \ -I$(top_srcdir)/modules/console/includes/ \ @@ -132,8 +132,8 @@ $(AM_CPPFLAGS) endif libsciscicos_cli_la_CPPFLAGS = $(libsciscicos_algo_la_CPPFLAGS) ---- scilab.orig/scilab/modules/slint/Makefile.am -+++ scilab/scilab/modules/slint/Makefile.am +--- a/scilab/modules/slint/Makefile.am ++++ b/scilab/modules/slint/Makefile.am @@ -126,7 +126,7 @@ -I$(top_srcdir)/modules/string/includes/ \ -I$(top_srcdir)/modules/dynamic_link/includes \ @@ -143,8 +143,8 @@ $(PCRE_CFLAGS) \ $(SLINT_FLAGS) \ $(AM_CPPFLAGS) ---- scilab.orig/scilab/modules/xcos/Makefile.am -+++ scilab/scilab/modules/xcos/Makefile.am +--- a/scilab/modules/xcos/Makefile.am ++++ b/scilab/modules/xcos/Makefile.am @@ -120,7 +120,7 @@ -I$(top_srcdir)/modules/localization/includes/ \ -I$(top_srcdir)/modules/fileio/includes/ \ @@ -163,8 +163,8 @@ $(AM_CPPFLAGS) XCOS_DISABLE_C_SOURCES = src/noxcos/noxcos.c ---- scilab.orig/scilab/modules/xml/Makefile.am -+++ scilab/scilab/modules/xml/Makefile.am +--- a/scilab/modules/xml/Makefile.am ++++ b/scilab/modules/xml/Makefile.am @@ -110,7 +110,7 @@ -I$(top_srcdir)/modules/fileio/includes/ \ -I$(top_srcdir)/modules/string/includes/ \ diff -Nru scilab-6.1.1+dfsg2/debian/patches/populating_java_options_by_default.patch scilab-6.1.1+dfsg2/debian/patches/populating_java_options_by_default.patch --- scilab-6.1.1+dfsg2/debian/patches/populating_java_options_by_default.patch 1970-01-01 01:00:00.000000000 +0100 +++ scilab-6.1.1+dfsg2/debian/patches/populating_java_options_by_default.patch 2023-03-11 14:13:54.000000000 +0100 @@ -0,0 +1,22 @@ +Description: initiating _JAVA_OPTIONS so that we can start scilab with + OpenJDK 17, and also we provide the necessary java.library.path. +Author: Pierre Gruet <p...@debian.org> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1012099 +Forwarded: no +Last-Update: 2023-03-11 + +--- a/scilab/bin/scilab ++++ b/scilab/bin/scilab +@@ -43,6 +43,12 @@ + # + ### + ++# We initialize _JAVA_OPTIONS so that the right paths are looked into and we ++# add the needed --add-opens to work with OpenJDK 17. ++if ! echo "${_JAVA_OPTIONS}" | grep -q "java\.library\.path" ; then ++ _JAVA_OPTIONS="${_JAVA_OPTIONS} -Djava.library.path=/usr/lib/jni:/usr/lib/scilab --add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED --add-opens=java.desktop/sun.java2d.opengl=ALL-UNNAMED" ++fi ++ + if test ! -z "$SCIVERBOSE"; then + SCIVERBOSE=1 + else diff -Nru scilab-6.1.1+dfsg2/debian/patches/selecting_unversioned_jars.patch scilab-6.1.1+dfsg2/debian/patches/selecting_unversioned_jars.patch --- scilab-6.1.1+dfsg2/debian/patches/selecting_unversioned_jars.patch 1970-01-01 01:00:00.000000000 +0100 +++ scilab-6.1.1+dfsg2/debian/patches/selecting_unversioned_jars.patch 2023-03-10 22:57:42.000000000 +0100 @@ -0,0 +1,19 @@ +Description: selecting the unversioned jars instead of the versioned ones, + taking profit of the ranks of '.' and '-'. +Author: Pierre Gruet <p...@debian.org> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1030205 +Forwarded: not-needed +Last-Update: 2023-03-10 + +--- a/scilab/m4/java-thirdparty.m4 ++++ b/scilab/m4/java-thirdparty.m4 +@@ -239,7 +239,8 @@ + + DEFAULT_JAR_DIR="$(pwd)/thirdparty/ $(pwd)/jar/ /usr/local/java/ /usr/local/java/jar /usr/local/share/java/ /usr/local/share/java/jar/ /usr/local/lib/java/ $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null | sort) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null) /opt/java/lib/" + +- jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name '$1.jar' -or -name 'lib$1.jar' -or -name 'lib$1-java.jar' -or -name '$1*.jar' \) 2>/dev/null |tr '\n' ':')." ++ # sorting jars in reverse order so that unversioned jars are before versioned ones. ++ jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name '$1.jar' -or -name 'lib$1.jar' -or -name 'lib$1-java.jar' -or -name '$1*.jar' \) 2>/dev/null | sort -r |tr '\n' ':')." + + if test ! -f conftestSharedChecker.class ; then + AC_JAVA_COMPILE_CHECKER_CLASS() diff -Nru scilab-6.1.1+dfsg2/debian/patches/series scilab-6.1.1+dfsg2/debian/patches/series --- scilab-6.1.1+dfsg2/debian/patches/series 2022-08-16 11:55:44.000000000 +0200 +++ scilab-6.1.1+dfsg2/debian/patches/series 2023-03-11 00:29:51.000000000 +0100 @@ -9,7 +9,6 @@ set_class_path.patch use_outside_font.patch java11-compatibility.patch -force-fop-jar-into-classpath.patch lucene4.10.patch ocaml_406.patch find_libs.patch @@ -22,3 +21,6 @@ ocaml_411.patch hdf5-1.10.7.patch glibc_2.34.patch +selecting_unversioned_jars.patch +fixing_doc_build.patch +populating_java_options_by_default.patch diff -Nru scilab-6.1.1+dfsg2/debian/scilab-full-bin.lintian-overrides scilab-6.1.1+dfsg2/debian/scilab-full-bin.lintian-overrides --- scilab-6.1.1+dfsg2/debian/scilab-full-bin.lintian-overrides 2022-08-16 11:55:44.000000000 +0200 +++ scilab-6.1.1+dfsg2/debian/scilab-full-bin.lintian-overrides 2023-03-10 23:20:38.000000000 +0100 @@ -1,4 +1,4 @@ # the actual binary which should not be called directly -scilab-full-bin: binary-without-manpage usr/bin/scilab-bin +scilab-full-bin: no-manual-page usr/bin/scilab-bin # Don't really care about this warning scilab-full-bin: classpath-contains-relative-path usr/share/java/org.scilab.modules.javasci.jar: ../../jvm/jar/org.scilab.modules.jvm.jar diff -Nru scilab-6.1.1+dfsg2/debian/scilab-minimal-bin.lintian-overrides scilab-6.1.1+dfsg2/debian/scilab-minimal-bin.lintian-overrides --- scilab-6.1.1+dfsg2/debian/scilab-minimal-bin.lintian-overrides 2022-08-16 11:55:44.000000000 +0200 +++ scilab-6.1.1+dfsg2/debian/scilab-minimal-bin.lintian-overrides 2023-03-10 23:20:38.000000000 +0100 @@ -1,4 +1,4 @@ # the actual binary which should not be called directly -scilab-minimal-bin: binary-without-manpage usr/bin/scilab-cli-bin +scilab-minimal-bin: no-manual-page usr/bin/scilab-cli-bin # False positive -scilab-minimal-bin: spelling-error-in-binary usr/lib/scilab/libscioptimization.so.6.1.0 pres press +scilab-minimal-bin: spelling-error-in-binary pres press [usr/lib/scilab/libscioptimization.so.6.1.0] diff -Nru scilab-6.1.1+dfsg2/debian/source/lintian-overrides scilab-6.1.1+dfsg2/debian/source/lintian-overrides --- scilab-6.1.1+dfsg2/debian/source/lintian-overrides 2022-08-16 11:55:44.000000000 +0200 +++ scilab-6.1.1+dfsg2/debian/source/lintian-overrides 2023-03-10 23:20:05.000000000 +0100 @@ -1,4 +1,4 @@ # In fact the same file lists only one license in metadata_license, but two in project_license -scilab source: inconsistent-appstream-metadata-license debian/copyright scilab/desktop/scilab.appdata.xml (cc0-1.0 != gpl-2+) +scilab source: inconsistent-appstream-metadata-license debian/copyright scilab/desktop/scilab.appdata.xml (cc0-1.0 != gpl-2+) [debian/copyright] # http://bugzilla.scilab.org/show_bug.cgi?id=16743 -scilab source: maintainer-manual-page debian/*.1 +scilab source: maintainer-manual-page [debian/*.1] diff -Nru scilab-6.1.1+dfsg2/debian/upstream/metadata scilab-6.1.1+dfsg2/debian/upstream/metadata --- scilab-6.1.1+dfsg2/debian/upstream/metadata 1970-01-01 01:00:00.000000000 +0100 +++ scilab-6.1.1+dfsg2/debian/upstream/metadata 2023-03-10 23:20:54.000000000 +0100 @@ -0,0 +1,2 @@ +--- +Repository-Browse: https://github.com/scilab/scilab