diff -Nru kate-4.14.1/debian/changelog kate-4.14.2/debian/changelog --- kate-4.14.1/debian/changelog 2014-09-19 18:43:29.000000000 +0000 +++ kate-4.14.2/debian/changelog 2014-10-10 11:04:15.000000000 +0000 @@ -1,10 +1,16 @@ -kate (4:4.14.1-0ubuntu1~ubuntu14.10~ppa2) utopic; urgency=medium +kate (4:4.14.2-0ubuntu1~ubuntu14.10~ppa1) utopic; urgency=medium + + * New upstream release + + -- Scarlett Clark Fri, 10 Oct 2014 04:04:06 -0700 + +kate (4:4.14.1-0ubuntu1) utopic; urgency=medium * New upstream release * Add missing file to katepart. * wrap-and-sort - -- Scarlett Clark Wed, 17 Sep 2014 13:36:56 -0700 + -- Scarlett Clark Mon, 22 Sep 2014 16:32:18 +0200 kate (4:4.14.0-0ubuntu1) utopic; urgency=medium diff -Nru kate-4.14.1/debian/control kate-4.14.2/debian/control --- kate-4.14.1/debian/control 2014-09-19 18:43:29.000000000 +0000 +++ kate-4.14.2/debian/control 2014-10-10 11:04:15.000000000 +0000 @@ -9,7 +9,7 @@ Build-Depends: cmake, debhelper (>= 9), kde-sc-dev-latest (>= 4:4.12), - kdelibs5-dev (>= 4:4.14.1), + kdelibs5-dev (>= 4:4.14.2), libkactivities-dev, libpython2.7-dev, libqjson-dev, diff -Nru kate-4.14.1/part/document/katedocument.cpp kate-4.14.2/part/document/katedocument.cpp --- kate-4.14.1/part/document/katedocument.cpp 2014-09-11 10:12:25.000000000 +0000 +++ kate-4.14.2/part/document/katedocument.cpp 2014-10-04 10:25:35.000000000 +0000 @@ -4198,8 +4198,6 @@ } else { m_config->setRemoveSpaces(0); } - - m_config->setRemoveSpaces( state ? 1 : 0 ); } else if ( var == "syntax" || var == "hl" ) { diff -Nru kate-4.14.1/part/schema/kateschemaconfig.cpp kate-4.14.2/part/schema/kateschemaconfig.cpp --- kate-4.14.1/part/schema/kateschemaconfig.cpp 2014-09-11 10:12:25.000000000 +0000 +++ kate-4.14.2/part/schema/kateschemaconfig.cpp 2014-10-04 10:25:35.000000000 +0000 @@ -1236,6 +1236,9 @@ // remove schema from combo box schemaCombo->removeItem(comboIndex); defaultSchemaCombo->removeItem(comboIndex); + + // Reload the color tab, since it uses cached schemas + m_colorTab->reload(); } bool KateSchemaConfigPage::newSchema (const QString& newName) diff -Nru kate-4.14.1/tests/data/indent/normal/emptyline2/expected kate-4.14.2/tests/data/indent/normal/emptyline2/expected --- kate-4.14.1/tests/data/indent/normal/emptyline2/expected 2014-09-11 10:12:25.000000000 +0000 +++ kate-4.14.2/tests/data/indent/normal/emptyline2/expected 2014-10-04 10:25:35.000000000 +0000 @@ -1,3 +1,3 @@ empty line padded with 4 spcs - + ok diff -Nru kate-4.14.1/tests/data/indent/pascal/comment1/expected kate-4.14.2/tests/data/indent/pascal/comment1/expected --- kate-4.14.1/tests/data/indent/pascal/comment1/expected 2014-09-11 10:12:25.000000000 +0000 +++ kate-4.14.2/tests/data/indent/pascal/comment1/expected 2014-10-04 10:25:35.000000000 +0000 @@ -1,3 +1,3 @@ // kate: cfgAutoInsertStar true; cfgSnapParen false; -(* +(* * ) diff -Nru kate-4.14.1/tests/data/indent/pascal/longtest1/expected kate-4.14.2/tests/data/indent/pascal/longtest1/expected --- kate-4.14.1/tests/data/indent/pascal/longtest1/expected 2014-09-11 10:12:25.000000000 +0000 +++ kate-4.14.2/tests/data/indent/pascal/longtest1/expected 2014-10-04 10:25:35.000000000 +0000 @@ -12,7 +12,7 @@ Another Comment Relative alignment should be kept ... - After indent, first character of this line should + After indent, first character of this line should still remain under the 'v' in relative *************************************************************************) diff -Nru kate-4.14.1/tests/data/indent/xml/.kateconfig kate-4.14.2/tests/data/indent/xml/.kateconfig --- kate-4.14.1/tests/data/indent/xml/.kateconfig 2014-09-11 10:12:25.000000000 +0000 +++ kate-4.14.2/tests/data/indent/xml/.kateconfig 2014-10-04 10:25:35.000000000 +0000 @@ -1 +1 @@ -kate: hl Xml; indent-mode xml; replace-tabs true; indent-width 2; +kate: hl Xml; indent-mode xml; replace-tabs true; indent-width 2; remove-trailing-spaces all; diff -Nru kate-4.14.1/tests/data/indent/xml/keep_indent/expected kate-4.14.2/tests/data/indent/xml/keep_indent/expected --- kate-4.14.1/tests/data/indent/xml/keep_indent/expected 2014-09-11 10:12:25.000000000 +0000 +++ kate-4.14.2/tests/data/indent/xml/keep_indent/expected 2014-10-04 10:25:35.000000000 +0000 @@ -1,2 +1,2 @@ - + PASS diff -Nru kate-4.14.1/tests/data/indent/xml/self_closing2/expected kate-4.14.2/tests/data/indent/xml/self_closing2/expected --- kate-4.14.1/tests/data/indent/xml/self_closing2/expected 2014-09-11 10:12:25.000000000 +0000 +++ kate-4.14.2/tests/data/indent/xml/self_closing2/expected 2014-10-04 10:25:35.000000000 +0000 @@ -1,5 +1,5 @@ - +