diff -Nru kate-16.12.1/addons/kate-ctags/katectagsplugin.desktop kate-16.12.3/addons/kate-ctags/katectagsplugin.desktop --- kate-16.12.1/addons/kate-ctags/katectagsplugin.desktop 2017-01-08 15:44:29.000000000 +0000 +++ kate-16.12.3/addons/kate-ctags/katectagsplugin.desktop 2017-03-04 10:15:05.000000000 +0000 @@ -65,7 +65,7 @@ Comment[bg]=Проверка на дефиниции и декларации с CTag Comment[bs]=Tražite definicije i deklaracije C‑tagsom Comment[ca]=Cerca definicions/declaracions amb CTags -Comment[ca@valencia]=Cerca definicions/declaracions amb CTags +Comment[ca@valencia]=Busca definicions/declaracions amb CTags Comment[cs]=Vyhledávání definic/deklarací pomocí CTags Comment[da]=Slå definitioner/erklæringer op med CTags Comment[de]=Definition/Deklaration mit CTags nachschauen diff -Nru kate-16.12.1/addons/konsole/katekonsoleplugin.desktop kate-16.12.3/addons/konsole/katekonsoleplugin.desktop --- kate-16.12.1/addons/konsole/katekonsoleplugin.desktop 2017-01-08 15:44:29.000000000 +0000 +++ kate-16.12.3/addons/konsole/katekonsoleplugin.desktop 2017-03-04 10:15:05.000000000 +0000 @@ -74,7 +74,7 @@ Comment[fi]=Päätesovelman sisältävä työkalunäkymä Comment[fr]=Vue des outils intégrant un composant graphique pour le terminal Comment[ga]=Amharc uirlisí a leabaíonn giuirléid teimpléid -Comment[gl]=Vista que incorpora un widget de terminal +Comment[gl]=Vista que incorpora un trebello de terminal Comment[he]=כלי המטמיע תצוגה של מסוף Comment[hu]=Eszköznézet, beágyazott terminál objektummal Comment[ia]=Vista de instrumento includente un widget de terminal diff -Nru kate-16.12.1/addons/project/kateprojectinfoview.cpp kate-16.12.3/addons/project/kateprojectinfoview.cpp --- kate-16.12.1/addons/project/kateprojectinfoview.cpp 2017-01-08 15:44:29.000000000 +0000 +++ kate-16.12.3/addons/project/kateprojectinfoview.cpp 2017-03-04 10:15:05.000000000 +0000 @@ -57,3 +57,7 @@ { } +void KateProjectInfoView::showEvent(QShowEvent *) +{ + setFocusProxy(currentWidget()); +} diff -Nru kate-16.12.1/addons/project/kateprojectinfoview.h kate-16.12.3/addons/project/kateprojectinfoview.h --- kate-16.12.1/addons/project/kateprojectinfoview.h 2017-01-08 15:44:29.000000000 +0000 +++ kate-16.12.3/addons/project/kateprojectinfoview.h 2017-03-04 10:15:05.000000000 +0000 @@ -56,6 +56,8 @@ return m_project; } + void showEvent(QShowEvent *) Q_DECL_OVERRIDE; + private: /** * our plugin view diff -Nru kate-16.12.1/addons/project/kateprojectinfoviewindex.cpp kate-16.12.3/addons/project/kateprojectinfoviewindex.cpp --- kate-16.12.1/addons/project/kateprojectinfoviewindex.cpp 2017-01-08 15:44:29.000000000 +0000 +++ kate-16.12.3/addons/project/kateprojectinfoviewindex.cpp 2017-03-04 10:15:05.000000000 +0000 @@ -60,6 +60,7 @@ layout->addWidget(m_lineEdit); layout->addWidget(m_treeView); setLayout(layout); + setFocusProxy(m_lineEdit); /** * connect needed signals diff -Nru kate-16.12.1/addons/project/kateprojectinfoviewnotes.cpp kate-16.12.3/addons/project/kateprojectinfoviewnotes.cpp --- kate-16.12.1/addons/project/kateprojectinfoviewnotes.cpp 2017-01-08 15:44:29.000000000 +0000 +++ kate-16.12.3/addons/project/kateprojectinfoviewnotes.cpp 2017-03-04 10:15:05.000000000 +0000 @@ -37,6 +37,7 @@ layout->addWidget(m_edit); setLayout(layout); m_edit->setDocument(project->notesDocument()); + setFocusProxy(m_edit); } KateProjectInfoViewNotes::~KateProjectInfoViewNotes() diff -Nru kate-16.12.1/addons/project/kateprojectpluginview.cpp kate-16.12.3/addons/project/kateprojectpluginview.cpp --- kate-16.12.1/addons/project/kateprojectpluginview.cpp 2017-01-08 15:44:29.000000000 +0000 +++ kate-16.12.3/addons/project/kateprojectpluginview.cpp 2017-03-04 10:15:05.000000000 +0000 @@ -188,6 +188,7 @@ */ m_stackedProjectViews->addWidget(view); m_stackedProjectInfoViews->addWidget(infoView); + m_stackedProjectInfoViews->setFocusProxy(infoView); m_projectsCombo->addItem(QIcon::fromTheme(QStringLiteral("project-open")), project->name(), project->fileName()); /** diff -Nru kate-16.12.1/addons/search/katesearch.desktop kate-16.12.3/addons/search/katesearch.desktop --- kate-16.12.1/addons/search/katesearch.desktop 2017-01-08 15:44:29.000000000 +0000 +++ kate-16.12.3/addons/search/katesearch.desktop 2017-03-04 10:15:05.000000000 +0000 @@ -8,7 +8,7 @@ Name[bg]=Търсене и &замяна Name[bs]=Pretraži i zamjeni Name[ca]=Cerca i substitueix -Name[ca@valencia]=Cerca i substitueix +Name[ca@valencia]=Busca i substitueix Name[cs]=Najít a nahradit Name[da]=Søg og erstat Name[de]=Suchen & Ersetzen @@ -61,7 +61,7 @@ Comment[bg]=Търсене и замяна в отворени документи или файлове на диска Comment[bs]=Traži i zamijeni u otvorenim dokumentima ili datotekama na disku Comment[ca]=Cerca i substitució en documents oberts o en fitxers al disc -Comment[ca@valencia]=Cerca i substitució en documents oberts o en fitxers al disc +Comment[ca@valencia]=Busca i substitució en documents oberts o en fitxers al disc Comment[cs]=Najít a nahradit v otevřených dokumentech nebo souborech na disku Comment[da]=Søg og erstat i åbne dokumenter eller i filer på disken Comment[de]=Suchen & Ersetzen in geöffneten Dateien oder in Dateien auf der Festplatte diff -Nru kate-16.12.1/addons/search/plugin_search.cpp kate-16.12.3/addons/search/plugin_search.cpp --- kate-16.12.1/addons/search/plugin_search.cpp 2017-01-08 15:44:29.000000000 +0000 +++ kate-16.12.3/addons/search/plugin_search.cpp 2017-03-04 10:15:05.000000000 +0000 @@ -239,6 +239,7 @@ connect(container, SIGNAL(nextFocus(QWidget*,bool*,bool)), this, SLOT(nextFocus(QWidget*,bool*,bool))); QAction *a = actionCollection()->addAction(QStringLiteral("search_in_files")); + actionCollection()->setDefaultShortcut(a, QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_F)); a->setText(i18n("Search in Files")); connect(a, SIGNAL(triggered(bool)), this, SLOT(openSearchView())); diff -Nru kate-16.12.1/CMakeLists.txt kate-16.12.3/CMakeLists.txt --- kate-16.12.1/CMakeLists.txt 2017-01-08 15:44:29.000000000 +0000 +++ kate-16.12.3/CMakeLists.txt 2017-03-04 10:15:05.000000000 +0000 @@ -9,7 +9,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}") # we need some parts of the ECM CMake helpers diff -Nru kate-16.12.1/debian/changelog kate-16.12.3/debian/changelog --- kate-16.12.1/debian/changelog 2017-01-19 16:19:28.000000000 +0000 +++ kate-16.12.3/debian/changelog 2017-03-10 21:30:31.000000000 +0000 @@ -1,3 +1,18 @@ +kate (4:16.12.3-0ubuntu1) zesty; urgency=medium + + [ José Manuel Santamaría Lema ] + * Stop re-building the package in debian/tests/testuite, use the build- + needed restriction instead (that is the correct way to rebuild the package + if needed). + * Create a $HOME dir before running the testsuite. This avoids the testsuite + hanging in environments where $HOME is not set. + * New upstream release (16.12.3) + + [ Darin Miller ] + * New upstream release (16.12.2) + + -- José Manuel Santamaría Lema Fri, 10 Mar 2017 21:30:31 +0000 + kate (4:16.12.1-0ubuntu1) zesty; urgency=medium [ José Manuel Santamaría Lema ] diff -Nru kate-16.12.1/debian/control kate-16.12.3/debian/control --- kate-16.12.1/debian/control 2017-01-19 16:19:28.000000000 +0000 +++ kate-16.12.3/debian/control 2017-03-10 21:30:31.000000000 +0000 @@ -7,30 +7,30 @@ Maximiliano Curia Build-Depends: cmake (>= 2.8.12), debhelper (>= 9), - extra-cmake-modules (>= 5.28.0~), - kinit-dev (>= 5.28.0~), + extra-cmake-modules (>= 5.31.0~), + kinit-dev (>= 5.31.0~), libgit2-dev, - libkf5activities-dev (>= 5.28.0~), - libkf5config-dev (>= 5.28.0~), - libkf5crash-dev (>= 5.28.0~), - libkf5dbusaddons-dev (>= 5.28.0~), - libkf5doctools-dev (>= 5.28.0~), - libkf5guiaddons-dev (>= 5.28.0~), - libkf5i18n-dev (>= 5.28.0~), - libkf5iconthemes-dev (>= 5.28.0~), - libkf5itemmodels-dev (>= 5.28.0~), - libkf5jobwidgets-dev (>= 5.28.0~), - libkf5kio-dev (>= 5.28.0~), - libkf5newstuff-dev (>= 5.28.0~), - libkf5notifications-dev (>= 5.28.0~), - libkf5parts-dev (>= 5.28.0~), - libkf5plasma-dev (>= 5.28.0~), - libkf5service-dev (>= 5.28.0~), - libkf5texteditor-dev (>= 5.28.0~), - libkf5threadweaver-dev (>= 5.28.0~), - libkf5wallet-dev (>= 5.28.0~), - libkf5windowsystem-dev (>= 5.28.0~), - libkf5xmlgui-dev (>= 5.28.0~), + libkf5activities-dev (>= 5.31.0~), + libkf5config-dev (>= 5.31.0~), + libkf5crash-dev (>= 5.31.0~), + libkf5dbusaddons-dev (>= 5.31.0~), + libkf5doctools-dev (>= 5.31.0~), + libkf5guiaddons-dev (>= 5.31.0~), + libkf5i18n-dev (>= 5.31.0~), + libkf5iconthemes-dev (>= 5.31.0~), + libkf5itemmodels-dev (>= 5.31.0~), + libkf5jobwidgets-dev (>= 5.31.0~), + libkf5kio-dev (>= 5.31.0~), + libkf5newstuff-dev (>= 5.31.0~), + libkf5notifications-dev (>= 5.31.0~), + libkf5parts-dev (>= 5.31.0~), + libkf5plasma-dev (>= 5.31.0~), + libkf5service-dev (>= 5.31.0~), + libkf5texteditor-dev (>= 5.31.0~), + libkf5threadweaver-dev (>= 5.31.0~), + libkf5wallet-dev (>= 5.31.0~), + libkf5windowsystem-dev (>= 5.31.0~), + libkf5xmlgui-dev (>= 5.31.0~), pkg-config, pkg-kde-tools (>= 0.15.15ubuntu1~), qtbase5-dev (>= 5.6.1~), diff -Nru kate-16.12.1/debian/tests/control kate-16.12.3/debian/tests/control --- kate-16.12.1/debian/tests/control 2017-01-19 16:19:28.000000000 +0000 +++ kate-16.12.3/debian/tests/control 2017-03-10 21:30:31.000000000 +0000 @@ -1,4 +1,4 @@ Tests: testsuite Depends: @, @builddeps@, build-essential, xvfb, xauth, dbus-x11 -Restrictions: rw-build-tree +Restrictions: build-needed diff -Nru kate-16.12.1/debian/tests/testsuite kate-16.12.3/debian/tests/testsuite --- kate-16.12.1/debian/tests/testsuite 2017-01-19 16:19:28.000000000 +0000 +++ kate-16.12.3/debian/tests/testsuite 2017-03-10 21:30:31.000000000 +0000 @@ -1,13 +1,4 @@ #!/bin/sh -sed -i 's/-DKDE4_BUILD_TESTS=false/-DKDE4_BUILD_TESTS=true/' debian/rules -if [ -d /usr/lib/ccache ]; then - export PATH="/usr/lib/ccache:$PATH" -fi -debian/rules clean 2>&1 -export DEB_HOST_MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH` -dpkg-source --before-build . -debian/rules build 2>&1 - xvfb-run -a --server-args="-screen 0 1024x768x24" \ dbus-launch --exit-with-session debian/tests/testsuite.xsession diff -Nru kate-16.12.1/debian/tests/testsuite.xsession kate-16.12.3/debian/tests/testsuite.xsession --- kate-16.12.1/debian/tests/testsuite.xsession 2017-01-19 16:19:28.000000000 +0000 +++ kate-16.12.3/debian/tests/testsuite.xsession 2017-03-10 21:30:31.000000000 +0000 @@ -1,6 +1,11 @@ #!/bin/sh + export LANG=C.UTF-8 export LC_ALL=C.UTF-8 + +[ -e debian/tests.home ] || mkdir debian/tests.home +export HOME="$(pwd)/debian/tests.home" + kdeinit5 dh_auto_test ret=$? diff -Nru kate-16.12.1/kate/data/org.kde.kate.appdata.xml kate-16.12.3/kate/data/org.kde.kate.appdata.xml --- kate-16.12.1/kate/data/org.kde.kate.appdata.xml 2017-01-08 15:44:29.000000000 +0000 +++ kate-16.12.3/kate/data/org.kde.kate.appdata.xml 2017-03-04 10:15:05.000000000 +0000 @@ -344,7 +344,7 @@
  • Regular expression based find & replace
  • بحث واستبدال مبنيّ على التّعابير النّمطيّة
  • Expressió regular basada en cerca i substitució
    • -
  • Expressió regular basada en cerca i substitució
    • +
  • Expressió regular basada en busca i substitució
  • Reguläre Ausdrücke für Suchen und Ersetzen
  • Κανονικές εκφράσεις σε find & replace
  • Regular expression based find & replace
    • @@ -478,7 +478,7 @@
  • Sınırsız geri alma/yeniden yapma desteği
  • Підтримка нескінченного буфера скасування і повторення дій.
  • xxInfinite undo/redo supportxx
    • -
  • 无限制撤消/重做支持
    • +
  • 无限制撤销/重做支持
  • 無限的復原/重做支援
  • Block selection mode
  • وضع التحديد الكتليّ
    • @@ -590,6 +590,7 @@
  • التّكامل مع الصّدفة
  • Integració de l'intèrpret d'ordres
  • Integració de l'intèrpret d'ordes
    • +
  • Integrace shellu
  • Einbindung einer Shell
  • Ενοποίηση κελύφους
  • Shell integration
    • @@ -624,6 +625,7 @@
  • دعم واسع للموافيق (http، وftp، وssh وwebdav وغيرها) عبر «عبيد KIO»
  • Implementació àmplia de protocols (http, ftp, ssh, webdav, etc.) usant kioslaves
  • Implementació àmplia de protocols (http, ftp, ssh, webdav, etc.) usant kioslaves
    • +
  • Široká podpora protokolů pomocí kioslaves (http, ftp, ssh, webdav atd.)
  • Unterstützung für viele Protokolle (http, ftp, ssh, webdav usw.) unter Verwendung von Ein-/Ausgabemodulen
  • Ευρεία υποστήριξη σε πρωτόκολλα (http, ftp, ssh, webdav κτλ.) με χρήση kioslaves
  • Wide protocol support (http, ftp, ssh, webdav etc.) using kioslaves
    • @@ -665,7 +667,7 @@
  • Pluginapõhine ülesehitus nii rakenduses kui ka redaktorikomponendis
  • Liitännäisarkkitehtuuri sovellukselle ja muokkainosalle
  • Architecture à modules complémentaires pour l'application et le composant éditeur
    • -
  • Arquitectura de complementos para o programa e mailo compoñente do editor.
    • +
  • Arquitectura de complementos para o aplicativo e o compoñente do editor.
  • Bővítmények támogatása az alkalmazásban és a szerkesztő komponensben
  • Architettura con estensioni per i componenti dell'applicazione e dell'editor
  • 프로그램과 편집기 구성 요소 플러그인 구조
    • diff -Nru kate-16.12.1/kate/katedocmanager.cpp kate-16.12.3/kate/katedocmanager.cpp --- kate-16.12.1/kate/katedocmanager.cpp 2017-01-08 15:44:29.000000000 +0000 +++ kate-16.12.3/kate/katedocmanager.cpp 2017-03-04 10:15:05.000000000 +0000 @@ -119,6 +119,14 @@ { QUrl u(url.adjusted(QUrl::NormalizePathSegments)); + // Resolve symbolic links for local files (done anyway in KTextEditor) + if (u.isLocalFile()) { + QString normalizedUrl = QFileInfo(u.toLocalFile()).canonicalFilePath(); + if (!normalizedUrl.isEmpty()) { + u = QUrl::fromLocalFile(normalizedUrl); + } + } + foreach(KTextEditor::Document * it, m_docList) { if (it->url() == u) { return it;