diff -Nru scilab-6.0.1/debian/changelog scilab-6.0.1/debian/changelog --- scilab-6.0.1/debian/changelog 2019-03-01 13:54:46.000000000 +0000 +++ scilab-6.0.1/debian/changelog 2019-03-19 12:51:26.000000000 +0000 @@ -1,8 +1,14 @@ -scilab (6.0.1-7~18.04.1) bionic; urgency=medium +scilab (6.0.1-7ubuntu1~18.04) bionic; urgency=medium * Backport for OpenJDK 11. LP: #1814133. - -- Matthias Klose Fri, 01 Mar 2019 14:54:46 +0100 + -- Matthias Klose Tue, 19 Mar 2019 13:51:26 +0100 + +scilab (6.0.1-7ubuntu1) disco; urgency=medium + + * Fix desktop startup. LP: #1807602. + + -- Matthias Klose Tue, 19 Mar 2019 13:44:44 +0100 scilab (6.0.1-7build2) disco; urgency=medium diff -Nru scilab-6.0.1/debian/patches/fix-desktop-startup.diff scilab-6.0.1/debian/patches/fix-desktop-startup.diff --- scilab-6.0.1/debian/patches/fix-desktop-startup.diff 1970-01-01 00:00:00.000000000 +0000 +++ scilab-6.0.1/debian/patches/fix-desktop-startup.diff 2019-03-19 12:44:34.000000000 +0000 @@ -0,0 +1,39 @@ +From f4ec0ce3c777443c40320d6ccb51ea7a3c6a5de9 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Cl=C3=A9ment=20DAVID?= +Date: Mon, 11 Feb 2019 22:35:40 +0100 +Subject: [PATCH] linux: fix desktop startup + +Change-Id: I348faf679ba4efd9c89cd1076ae0039811ff6755 +--- + scilab/modules/startup/src/cpp/scilab.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/scilab/modules/startup/src/cpp/scilab.cpp b/scilab/modules/startup/src/cpp/scilab.cpp +index 769208c..c9fca1d 100644 +--- a//modules/startup/src/cpp/scilab.cpp ++++ b//modules/startup/src/cpp/scilab.cpp +@@ -415,9 +415,9 @@ int main(int argc, char *argv[]) + // | [-nw] -> Terminal IO + InitMacOSXEnv + #ifndef WITHOUT_GUI + #ifdef _MSC_VER +- #ifndef WITH_CONSOLE_JAVA +- pSEI->iConsoleMode = SCILAB_NW; +- #endif ++#ifndef WITH_CONSOLE_JAVA ++ pSEI->iConsoleMode = SCILAB_NW; ++#endif + #endif + if (pSEI->iConsoleMode) + { +@@ -472,7 +472,7 @@ int main(int argc, char *argv[]) + + if (!isatty(_fileno(stdin)) && (_fileno(stdin) != -2) && getScilabMode() != SCILAB_STD) + #else +- if (!isatty(fileno(stdin))) ++ if (!isatty(fileno(stdin)) && getScilabMode() != SCILAB_STD) + #endif + { + // We are in a pipe +-- +1.7.9.5 + diff -Nru scilab-6.0.1/debian/patches/series scilab-6.0.1/debian/patches/series --- scilab-6.0.1/debian/patches/series 2018-12-05 11:51:09.000000000 +0000 +++ scilab-6.0.1/debian/patches/series 2019-03-19 12:44:00.000000000 +0000 @@ -22,3 +22,4 @@ use_outside_font.patch java11-compatibility.patch force-fop-jar-into-classpath.patch +fix-desktop-startup.diff