diff -Nru konsole-4.8.1/debian/changelog konsole-4.8.2/debian/changelog --- konsole-4.8.1/debian/changelog 2012-03-08 17:02:25.000000000 +0000 +++ konsole-4.8.2/debian/changelog 2012-04-04 00:24:25.000000000 +0000 @@ -1,3 +1,9 @@ +konsole (4:4.8.2-0ubuntu1) precise; urgency=low + + * New upstream release + + -- Philip Muškovac Mon, 02 Apr 2012 18:49:48 +0200 + konsole (4:4.8.1-0ubuntu1) precise; urgency=low * New upstream release diff -Nru konsole-4.8.1/debian/control konsole-4.8.2/debian/control --- konsole-4.8.1/debian/control 2012-03-08 17:02:25.000000000 +0000 +++ konsole-4.8.2/debian/control 2012-04-04 00:24:25.000000000 +0000 @@ -5,7 +5,7 @@ XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: José Manuel Santamaría Lema , Eshat Cakar -Build-Depends: kde-sc-dev-latest (>= 4:4.8.1), +Build-Depends: kde-sc-dev-latest (>= 4:4.8.2), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), kdelibs5-dev (>= 4:4.8.1), libphonon-dev (>= 4:4.3.0), libxkbfile-dev, libkonq5-dev Binary files /tmp/bUYfclGSuj/konsole-4.8.1/doc/manual/index.cache.bz2 and /tmp/_03iFVcI_a/konsole-4.8.2/doc/manual/index.cache.bz2 differ diff -Nru konsole-4.8.1/src/main.cpp konsole-4.8.2/src/main.cpp --- konsole-4.8.1/src/main.cpp 2012-02-29 22:56:57.000000000 +0000 +++ konsole-4.8.2/src/main.cpp 2012-03-29 20:33:10.000000000 +0000 @@ -30,7 +30,7 @@ #include #include -#define KONSOLE_VERSION "2.8.1" +#define KONSOLE_VERSION "2.8.2" // standard input file descriptor static const int STDIN = 0; diff -Nru konsole-4.8.1/src/ProcessInfo.cpp konsole-4.8.2/src/ProcessInfo.cpp --- konsole-4.8.1/src/ProcessInfo.cpp 2011-11-17 20:57:16.000000000 +0000 +++ konsole-4.8.2/src/ProcessInfo.cpp 2012-04-02 11:28:40.000000000 +0000 @@ -1040,7 +1040,10 @@ } else { - argument = args[i+1] ; + // Verify correct # arguments are given + if ((i + 1) < args.count()) { + argument = args[i + 1]; + } i++; } diff -Nru konsole-4.8.1/src/Session.cpp konsole-4.8.2/src/Session.cpp --- konsole-4.8.1/src/Session.cpp 2011-12-02 21:31:44.000000000 +0000 +++ konsole-4.8.2/src/Session.cpp 2012-03-29 20:33:10.000000000 +0000 @@ -840,6 +840,10 @@ void Session::done(int exitCode, QProcess::ExitStatus exitStatus) { + // This slot should be triggered only one time + disconnect(_shellProcess, SIGNAL(finished(int,QProcess::ExitStatus)), + this, SLOT(done(int,QProcess::ExitStatus))); + if ( !_autoClose ) { _userTitle = i18nc("@info:shell This session is done", "Finished"); @@ -953,8 +957,14 @@ void Session::updateSessionProcessInfo() { Q_ASSERT(_shellProcess); - if (!_sessionProcessInfo) - { + + bool ok; + // The checking for pid changing looks stupid, but it is needed + // at the moment to workaround the problem that processId() might + // return 0 + if (!_sessionProcessInfo || + ( processId() != 0 && processId() != _sessionProcessInfo->pid(&ok) ) ) { + delete _sessionProcessInfo; _sessionProcessInfo = ProcessInfo::newInstance(processId()); _sessionProcessInfo->setUserHomeDir(); } diff -Nru konsole-4.8.1/src/ShellCommand.cpp konsole-4.8.2/src/ShellCommand.cpp --- konsole-4.8.1/src/ShellCommand.cpp 2011-11-17 20:57:16.000000000 +0000 +++ konsole-4.8.2/src/ShellCommand.cpp 2012-03-29 20:33:10.000000000 +0000 @@ -39,7 +39,7 @@ _arguments = arguments; if ( !_arguments.isEmpty() ) - _arguments[0] == command; + _arguments[0] = command; } QString ShellCommand::fullCommand() const { diff -Nru konsole-4.8.1/src/TerminalDisplay.cpp konsole-4.8.2/src/TerminalDisplay.cpp --- konsole-4.8.1/src/TerminalDisplay.cpp 2011-12-02 21:31:44.000000000 +0000 +++ konsole-4.8.2/src/TerminalDisplay.cpp 2012-04-02 11:28:40.000000000 +0000 @@ -720,10 +720,18 @@ // Qt::LeftToRight for this widget // // This was discussed in: http://lists.kde.org/?t=120552223600002&r=1&w=2 - if (_bidiEnabled) - painter.drawText(rect,0,text); + if (_bidiEnabled) { + painter.drawText(rect, 0, text); + } else - painter.drawText(rect,0,LTR_OVERRIDE_CHAR+text); + { + // See bug 280896 for more info +#if QT_VERSION >= 0x040800 + painter.drawText(rect, Qt::AlignBottom, LTR_OVERRIDE_CHAR + text); +#else + painter.drawText(rect, 0, LTR_OVERRIDE_CHAR + text); +#endif + } } } diff -Nru konsole-4.8.1/src/TerminalDisplay.h konsole-4.8.2/src/TerminalDisplay.h --- konsole-4.8.1/src/TerminalDisplay.h 2011-11-17 20:57:16.000000000 +0000 +++ konsole-4.8.2/src/TerminalDisplay.h 2012-04-02 11:28:40.000000000 +0000 @@ -398,7 +398,17 @@ * Sets the status of the BiDi rendering inside the terminal display. * Defaults to disabled. */ - void setBidiEnabled(bool set) { _bidiEnabled=set; } + void setBidiEnabled(bool set) { + _bidiEnabled=set; + // See bug 280896 for more info +#if QT_VERSION >= 0x040800 + if (_bidiEnabled) { + setLineSpacing(0); + } else { + setLineSpacing(2); + } +#endif + } /** * Returns the status of the BiDi rendering in this widget. */