diff -Nru scilab-6.1.1+dfsg2/debian/changelog scilab-6.1.1+dfsg2/debian/changelog --- scilab-6.1.1+dfsg2/debian/changelog 2021-11-11 15:32:02.000000000 +0000 +++ scilab-6.1.1+dfsg2/debian/changelog 2022-04-14 22:30:04.000000000 +0000 @@ -1,3 +1,10 @@ +scilab (6.1.1+dfsg2-3ubuntu1) jammy; urgency=medium + + * Fixed FTBFS due to conflict between signal.h pause function and scilab + pause() function. renamed it to scipause (LP: #1969227) + + -- Matthieu Clemenceau Thu, 14 Apr 2022 17:30:04 -0500 + scilab (6.1.1+dfsg2-3) unstable; urgency=medium * Bump standards-version to 4.6.0. diff -Nru scilab-6.1.1+dfsg2/debian/control scilab-6.1.1+dfsg2/debian/control --- scilab-6.1.1+dfsg2/debian/control 2021-11-11 15:32:02.000000000 +0000 +++ scilab-6.1.1+dfsg2/debian/control 2022-04-14 22:30:04.000000000 +0000 @@ -1,7 +1,8 @@ Source: scilab Section: math Priority: optional -Maintainer: Debian Science Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Science Team Uploaders: Julien Puydt Build-Depends: debhelper-compat (= 13), gfortran, time, default-jdk, chrpath, ocaml-nox (>= 3.11.2-3), libnum-ocaml-dev, fakeroot, diff -Nru scilab-6.1.1+dfsg2/debian/patches/pause_to_scipause.patch scilab-6.1.1+dfsg2/debian/patches/pause_to_scipause.patch --- scilab-6.1.1+dfsg2/debian/patches/pause_to_scipause.patch 1970-01-01 00:00:00.000000000 +0000 +++ scilab-6.1.1+dfsg2/debian/patches/pause_to_scipause.patch 2022-04-14 22:30:04.000000000 +0000 @@ -0,0 +1,51 @@ +--- a/scilab/modules/core/src/cpp/pause.cpp ++++ b/scilab/modules/core/src/cpp/pause.cpp +@@ -11,15 +11,15 @@ + * + */ + +-#include "configvariable.hxx" +-#include "threadmanagement.hxx" +-#include "runner.hxx" +- + extern "C" { + #include "pause.h" + } + +-void pause(void) ++#include "configvariable.hxx" ++#include "threadmanagement.hxx" ++#include "runner.hxx" ++ ++void scipause(void) + { + ConfigVariable::IncreasePauseLevel(); + +@@ -43,4 +43,4 @@ + + //return from console so change mode to initial + ConfigVariable::setPromptMode(iOldMode); +-} +\ No newline at end of file ++} +--- a/scilab/modules/core/includes/pause.h ++++ b/scilab/modules/core/includes/pause.h +@@ -15,6 +15,6 @@ + #define __PAUSE_H__ + + #include "dynlib_core.h" +-CORE_IMPEXP void pause(void); ++CORE_IMPEXP void scipause(void); + + #endif /* !__PAUSE_H__ */ +--- a/scilab/modules/core/sci_gateway/cpp/sci_pause.cpp ++++ b/scilab/modules/core/sci_gateway/cpp/sci_pause.cpp +@@ -47,7 +47,7 @@ + ConfigVariable::macroFirstLine_begin(2); + + // do pause +- pause(); ++ scipause(); + + return types::Function::OK; + } 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 2021-11-11 15:32:02.000000000 +0000 +++ scilab-6.1.1+dfsg2/debian/patches/series 2022-04-14 22:30:04.000000000 +0000 @@ -21,3 +21,4 @@ find_external_libintl_jar.patch ocaml_411.patch hdf5-1.10.7.patch +pause_to_scipause.patch