[qgis] 01/03: Add patch to fix GRASS 7.2 support in processing. (closes: #858251)

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository qgis.

commit 9b4474b88deae87b3135d5e83ea049ceb7c3a701
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Mar 21 11:57:30 2017 +0100

    Add patch to fix GRASS 7.2 support in processing. (closes: #858251)
---
 debian/changelog             |  7 +++++++
 debian/patches/grass72.patch | 41 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 49 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b328b27..e35cde1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qgis (2.14.12+dfsg-1~exp2) UNRELEASED; urgency=medium
+
+  * Add patch to fix GRASS 7.2 support in processing.
+    (closes: #858251)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 21 Mar 2017 11:56:48 +0100
+
 qgis (2.14.12+dfsg-1~exp1) experimental; urgency=medium
 
   [ Jürgen E. Fischer ]
diff --git a/debian/patches/grass72.patch b/debian/patches/grass72.patch
new file mode 100644
index 0000000..a36927f
--- /dev/null
+++ b/debian/patches/grass72.patch
@@ -0,0 +1,41 @@
+Description: Add support for GRASS 7.2.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug-Debian: https://bugs.debian.org/858251
+
+--- a/python/plugins/processing/algs/grass7/Grass7AlgorithmProvider.py
++++ b/python/plugins/processing/algs/grass7/Grass7AlgorithmProvider.py
+@@ -100,7 +100,7 @@ class Grass7AlgorithmProvider(AlgorithmP
+         return self.tr('GRASS GIS 7 commands')
+ 
+     def getName(self):
+-        return 'grass70'
++        return 'grass72'
+ 
+     def getIcon(self):
+         return QIcon(os.path.join(pluginPath, 'images', 'grass.svg'))
+--- a/python/plugins/processing/algs/grass7/Grass7Utils.py
++++ b/python/plugins/processing/algs/grass7/Grass7Utils.py
+@@ -77,7 +77,7 @@ class Grass7Utils:
+     def getGrassVersion():
+         # FIXME: I do not know if this should be removed or let the user enter it
+         # or something like that... This is just a temporary thing
+-        return '7.0.0'
++        return '7.2.0'
+ 
+     @staticmethod
+     def grassPath():
+@@ -251,7 +251,7 @@ class Grass7Utils:
+                 command = Grass7Utils.grassPath() + os.sep + 'grass.sh ' \
+                     + Grass7Utils.grassMapsetFolder() + '/PERMANENT'
+             else:
+-                command = 'grass70 ' + Grass7Utils.grassMapsetFolder() \
++                command = 'grass ' + Grass7Utils.grassMapsetFolder() \
+                     + '/PERMANENT'
+ 
+         return command, env
+@@ -417,4 +417,4 @@ class Grass7Utils:
+                         helpPath = os.path.abspath(path)
+                         break
+ 
+-        return helpPath if helpPath is not None else 'http://grass.osgeo.org/grass70/manuals/'
++        return helpPath if helpPath is not None else 'http://grass.osgeo.org/grass72/manuals/'
diff --git a/debian/patches/series b/debian/patches/series
index 24400d0..47d4596 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ qtermwidget-kfreebsd.patch
 qtermwidget-hurd.patch
 qt4-without-qtwebkit.patch
 columns-typo.patch
+grass72.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git