This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository qgis.
commit 354f7fd15f8938089fc1bd335a037df7ae164688 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Mon Dec 8 23:57:58 2014 +0100 Add patch from release-2_6 branch to fix layer selection issue. --- debian/changelog | 1 + debian/patches/0001-backported-fix-for-11694.patch | 29 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 31 insertions(+) diff --git a/debian/changelog b/debian/changelog index a57da01..9483d1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ qgis (2.6.1-1~exp1) UNRELEASED; urgency=medium * Refresh patches. * Update symbols for amd64. * Replace qgis-mapserver by qgis-server using Provides/Conflicts/Replaces. + * Add patch from release-2_6 branch to fix layer selection issue. -- Bas Couwenberg <sebas...@xs4all.nl> Wed, 03 Dec 2014 13:03:31 +0100 diff --git a/debian/patches/0001-backported-fix-for-11694.patch b/debian/patches/0001-backported-fix-for-11694.patch new file mode 100644 index 0000000..bc20aee --- /dev/null +++ b/debian/patches/0001-backported-fix-for-11694.patch @@ -0,0 +1,29 @@ +From c63f34693df705481c89391b4f3b381bebd6a984 Mon Sep 17 00:00:00 2001 +From: Anita Graser <anitagra...@gmx.at> +Date: Mon, 8 Dec 2014 10:55:07 +0100 +Subject: backported fix for # 11694 +Bug: http://hub.qgis.org/issues/11694 +Origin: https://github.com/qgis/QGIS/commit/c63f34693df705481c89391b4f3b381bebd6a984 + +http://hub.qgis.org/projects/quantum-gis/repository/revisions/810cb3fb999d9fdd6c1d6fe7b353ab83ce85b17c/diff/python/plugins/processing/modeler/ModelerParametersDialog.py +--- + python/plugins/processing/modeler/ModelerParametersDialog.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/python/plugins/processing/modeler/ModelerParametersDialog.py ++++ b/python/plugins/processing/modeler/ModelerParametersDialog.py +@@ -261,10 +261,12 @@ class ModelerParametersDialog(QDialog): + item.addItem(self.resolveValueDescription(layer), layer) + elif isinstance(param, ParameterTable): + item = QComboBox() +- item.setEditable(True) +- layers = self.getAvailableValuesOfType(ParameterTable, OutputTable) ++ tables = self.getAvailableValuesOfType(ParameterTable, OutputTable) ++ layers = self.getAvailableValuesOfType(ParameterVector, OutputVector) + if param.optional: + item.addItem(self.NOT_SELECTED, None) ++ for table in tables: ++ item.addItem(self.resolveValueDescription(table), table) + for layer in layers: + item.addItem(self.resolveValueDescription(layer), layer) + elif isinstance(param, ParameterBoolean): diff --git a/debian/patches/series b/debian/patches/series index 240a1f5..ededb62 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ allows-to-typo.patch python-env.patch disable-doxygen.patch +0001-backported-fix-for-11694.patch -- 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