diff -Nru konsole-16.12.1/CMakeLists.txt konsole-16.12.3/CMakeLists.txt --- konsole-16.12.1/CMakeLists.txt 2017-01-07 18:47:24.000000000 +0000 +++ konsole-16.12.3/CMakeLists.txt 2017-03-04 10:15:40.000000000 +0000 @@ -4,7 +4,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") set (KDE_APPLICATIONS_VERSION_MINOR "12") -set (KDE_APPLICATIONS_VERSION_MICRO "1") +set (KDE_APPLICATIONS_VERSION_MICRO "3") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") # minimal requirements diff -Nru konsole-16.12.1/debian/changelog konsole-16.12.3/debian/changelog --- konsole-16.12.1/debian/changelog 2017-02-16 19:24:33.000000000 +0000 +++ konsole-16.12.3/debian/changelog 2017-03-10 21:29:26.000000000 +0000 @@ -1,3 +1,14 @@ +konsole (4:16.12.3-0ubuntu1) zesty; urgency=low + + [ Darin Miller ] + * New upstream release (16.12.2) + * Drop upstream applied patch. + + [ José Manuel Santamaría Lema ] + * New upstream release (16.12.3) + + -- José Manuel Santamaría Lema Fri, 10 Mar 2017 21:29:26 +0000 + konsole (4:16.12.1-0ubuntu2) zesty; urgency=medium * Add upstream-fix-build.patch. Can be dropped in 16.12.2 diff -Nru konsole-16.12.1/debian/control konsole-16.12.3/debian/control --- konsole-16.12.1/debian/control 2017-02-16 19:24:33.000000000 +0000 +++ konsole-16.12.3/debian/control 2017-03-10 21:29:26.000000000 +0000 @@ -7,28 +7,28 @@ Maximiliano Curia Build-Depends: cmake (>= 2.8.12), debhelper (>= 9), - extra-cmake-modules (>= 5.28.0~), - kinit-dev (>= 5.28.0~), - libkf5bookmarks-dev (>= 5.28.0~), - libkf5completion-dev (>= 5.28.0~), - libkf5config-dev (>= 5.28.0~), - libkf5configwidgets-dev (>= 5.28.0~), - libkf5coreaddons-dev (>= 5.28.0~), - libkf5doctools-dev (>= 5.28.0~), - libkf5guiaddons-dev (>= 5.28.0~), - libkf5i18n-dev (>= 5.28.0~), - libkf5iconthemes-dev (>= 5.28.0~), - libkf5kdelibs4support-dev (>= 5.28.0~), - libkf5kio-dev (>= 5.28.0~), - libkf5notifications-dev (>= 5.28.0~), - libkf5notifyconfig-dev (>= 5.28.0~), - libkf5parts-dev (>= 5.28.0~), - libkf5pty-dev (>= 5.28.0~), - libkf5service-dev (>= 5.28.0~), - libkf5textwidgets-dev (>= 5.28.0~), - libkf5widgetsaddons-dev (>= 5.28.0~), - libkf5windowsystem-dev (>= 5.28.0~), - libkf5xmlgui-dev (>= 5.28.0~), + extra-cmake-modules (>= 5.31.0~), + kinit-dev (>= 5.31.0~), + libkf5bookmarks-dev (>= 5.31.0~), + libkf5completion-dev (>= 5.31.0~), + libkf5config-dev (>= 5.31.0~), + libkf5configwidgets-dev (>= 5.31.0~), + libkf5coreaddons-dev (>= 5.31.0~), + libkf5doctools-dev (>= 5.31.0~), + libkf5guiaddons-dev (>= 5.31.0~), + libkf5i18n-dev (>= 5.31.0~), + libkf5iconthemes-dev (>= 5.31.0~), + libkf5kdelibs4support-dev (>= 5.31.0~), + libkf5kio-dev (>= 5.31.0~), + libkf5notifications-dev (>= 5.31.0~), + libkf5notifyconfig-dev (>= 5.31.0~), + libkf5parts-dev (>= 5.31.0~), + libkf5pty-dev (>= 5.31.0~), + libkf5service-dev (>= 5.31.0~), + libkf5textwidgets-dev (>= 5.31.0~), + libkf5widgetsaddons-dev (>= 5.31.0~), + libkf5windowsystem-dev (>= 5.31.0~), + libkf5xmlgui-dev (>= 5.31.0~), libx11-dev, pkg-kde-tools (>= 0.15.16~), qtbase5-dev (>= 5.6.1~), diff -Nru konsole-16.12.1/debian/patches/series konsole-16.12.3/debian/patches/series --- konsole-16.12.1/debian/patches/series 2017-02-16 19:24:33.000000000 +0000 +++ konsole-16.12.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -upstream-fix-build.patch diff -Nru konsole-16.12.1/debian/patches/upstream-fix-build.patch konsole-16.12.3/debian/patches/upstream-fix-build.patch --- konsole-16.12.1/debian/patches/upstream-fix-build.patch 2017-02-16 19:24:33.000000000 +0000 +++ konsole-16.12.3/debian/patches/upstream-fix-build.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -From 3a055ea19d5f458ccf06a33c697fbcda7a7f14df Mon Sep 17 00:00:00 2001 -From: Aleix Pol -Date: Wed, 18 Jan 2017 12:15:00 +0100 -Subject: Fix build - -frameworks/konsole/src/Session.cpp:839:5: warning: 'not' is not defined, -evaluates to 0 [-Wundef] ---- - src/Session.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Session.cpp b/src/Session.cpp -index d63c8a0..482ee0b 100644 ---- a/src/Session.cpp -+++ b/src/Session.cpp -@@ -836,7 +836,7 @@ void Session::sendTextToTerminal(const QString& text, const QChar& eol) const - // Only D-Bus calls this function (via SendText or runCommand) - void Session::sendText(const QString& text) const - { --#if not defined(REMOVE_SENDTEXT_RUNCOMMAND_DBUS_METHODS) -+#if !defined(REMOVE_SENDTEXT_RUNCOMMAND_DBUS_METHODS) - if (show_disallow_certain_dbus_methods_message) { - - KNotification::event(KNotification::Warning, "Konsole D-Bus Warning", --- -cgit v0.11.2 diff -Nru konsole-16.12.1/desktop/konsolehere.desktop konsole-16.12.3/desktop/konsolehere.desktop --- konsole-16.12.1/desktop/konsolehere.desktop 2017-01-07 18:47:24.000000000 +0000 +++ konsole-16.12.3/desktop/konsolehere.desktop 2017-03-04 10:15:40.000000000 +0000 @@ -105,6 +105,7 @@ Comment=Opens a terminal at the current folder Comment[ca]=Obre un terminal en la carpeta actual Comment[ca@valencia]=Obri un terminal en la carpeta actual +Comment[cs]=Otevře terminál v současné složce Comment[da]=Åbner en terminal i den aktuelle mappe Comment[de]=Öffnet ein Terminal in dem aktuellen Ordner Comment[el]=Ανοίγει τερματικό στον τρέχοντα φάκελο diff -Nru konsole-16.12.1/src/Session.cpp konsole-16.12.3/src/Session.cpp --- konsole-16.12.1/src/Session.cpp 2017-01-07 18:47:24.000000000 +0000 +++ konsole-16.12.3/src/Session.cpp 2017-03-04 10:15:40.000000000 +0000 @@ -836,7 +836,7 @@ // Only D-Bus calls this function (via SendText or runCommand) void Session::sendText(const QString& text) const { -#if not defined(REMOVE_SENDTEXT_RUNCOMMAND_DBUS_METHODS) +#if !defined(REMOVE_SENDTEXT_RUNCOMMAND_DBUS_METHODS) if (show_disallow_certain_dbus_methods_message) { KNotification::event(KNotification::Warning, "Konsole D-Bus Warning", diff -Nru konsole-16.12.1/src/TerminalDisplay.cpp konsole-16.12.3/src/TerminalDisplay.cpp --- konsole-16.12.1/src/TerminalDisplay.cpp 2017-01-07 18:47:24.000000000 +0000 +++ konsole-16.12.3/src/TerminalDisplay.cpp 2017-03-04 10:15:40.000000000 +0000 @@ -1757,7 +1757,8 @@ void TerminalDisplay::resizeEvent(QResizeEvent*) { - updateImageSize(); + if (contentsRect().isValid()) + updateImageSize(); } void TerminalDisplay::propagateSize()