diff --git a/debian/changelog b/debian/changelog index 0108f4b..9b66f2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lxqt-session (0.14.1-2ubuntu3) UNRELEASED; urgency=medium + + * Remove reverse-applicable forward-process-output.patch. + + -- Simon Quigley Fri, 24 Apr 2020 00:27:35 -0500 + lxqt-session (0.14.1-2ubuntu2) focal; urgency=medium * Updated rules to match debian unstable. diff --git a/debian/patches/forward-process-output.patch b/debian/patches/forward-process-output.patch deleted file mode 100644 index e8e2faf..0000000 --- a/debian/patches/forward-process-output.patch +++ /dev/null @@ -1,20 +0,0 @@ -Author: Luís Pereira -Date: Thu May 9 21:14:08 2019 +0100 - - Don't throw stderr/stdout to a black hole - Implement the consensus solution achieved described in https://github.com/lxqt/lxqt-session/pull/256. - It was, actually, one the alternative proposed by https://github.com/keturn. - -diff --git a/lxqt-session/src/lxqtmodman.cpp b/lxqt-session/src/lxqtmodman.cpp -index 2beff61..d11ffc0 100644 ---- a/lxqt-session/src/lxqtmodman.cpp -+++ b/lxqt-session/src/lxqtmodman.cpp -@@ -467,6 +467,7 @@ LXQtModule::LXQtModule(const XdgDesktopFile& file, QObject* parent) : - fileName(QFileInfo(file.fileName()).fileName()), - mIsTerminating(false) - { -+ QProcess::setProcessChannelMode(QProcess::ForwardedChannels); - connect(this, SIGNAL(stateChanged(QProcess::ProcessState)), SLOT(updateState(QProcess::ProcessState))); - } - - diff --git a/debian/patches/series b/debian/patches/series index b442998..0ed5a23 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -forward-process-output.patch ensure-necessary-paths-are-pulled-from.patch