1. Forum
  2. Usenet
  3. LINUX.DEBIAN.DEVEL.RELEAS

  • Bug#1032855: marked as done (unblock: scilab/6.1.1+dfsg2-5) (2/2)

    From Debian Bug Tracking System@21:1/5 to All on Mon Mar 13 12:40:01 2023
    [continued from previous message]

    ---- 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/include