This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository qgis.
commit a5841bc9a8a781300bb4c6d55d0451b0008d7a15 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Mar 1 14:41:13 2014 +0100 Add patch from upstream release_2.2 branch: 0001-expressions-put-black-in-front-of-ELSE-and-WHEN-fixe.patch --- ...-put-black-in-front-of-ELSE-and-WHEN-fixe.patch | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/debian/patches/0001-expressions-put-black-in-front-of-ELSE-and-WHEN-fixe.patch b/debian/patches/0001-expressions-put-black-in-front-of-ELSE-and-WHEN-fixe.patch new file mode 100644 index 0000000..7b2bdc6 --- /dev/null +++ b/debian/patches/0001-expressions-put-black-in-front-of-ELSE-and-WHEN-fixe.patch @@ -0,0 +1,30 @@ +From 6aa52e1b2146a94cb74ead29f9a94e2bef3f3926 Mon Sep 17 00:00:00 2001 +From: "Juergen E. Fischer" <j...@norbit.de> +Date: Wed, 26 Feb 2014 16:27:24 +0100 +Subject: expressions: put black in front of ELSE and WHEN (fixes #9666) +Bug: http://hub.qgis.org/issues/9666 +Origin: https://github.com/qgis/QGIS/commit/6aa52e1b2146a94cb74ead29f9a94e2bef3f3926 + +--- + src/core/qgsexpression.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/src/core/qgsexpression.cpp ++++ b/src/core/qgsexpression.cpp +@@ -2337,13 +2337,13 @@ bool QgsExpression::NodeCondition::prepa + + QString QgsExpression::NodeCondition::dump() const + { +- QString msg = QString( "CASE " ); ++ QString msg = QString( "CASE" ); + foreach ( WhenThen* cond, mConditions ) + { +- msg += QString( "WHEN %1 THEN %2" ).arg( cond->mWhenExp->dump() ).arg( cond->mThenExp->dump() ); ++ msg += QString( " WHEN %1 THEN %2" ).arg( cond->mWhenExp->dump() ).arg( cond->mThenExp->dump() ); + } + if ( mElseExp ) +- msg += QString( "ELSE %1" ).arg( mElseExp->dump() ); ++ msg += QString( " ELSE %1" ).arg( mElseExp->dump() ); + msg += QString( " END" ); + return msg; + } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel