Bug#858391: unblock: qgis/2.14.11+dfsg-3

[Bas Couwenberg]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock

Please unblock package qgis

It fixes the integration with GRASS 7.2 in the Processing plugin.
(#858251)

unblock qgis/2.14.11+dfsg-3

Kind Regards,

Bas
-------------- next part --------------
diff -Nru qgis-2.14.11+dfsg/debian/changelog qgis-2.14.11+dfsg/debian/changelog
--- qgis-2.14.11+dfsg/debian/changelog	2017-02-13 18:43:07.000000000 +0100
+++ qgis-2.14.11+dfsg/debian/changelog	2017-03-21 12:49:51.000000000 +0100
@@ -1,3 +1,11 @@
+qgis (2.14.11+dfsg-3) unstable; urgency=medium
+
+  * Add patch to fix GRASS 7.2 support in processing.
+    (closes: #858251)
+  * Update branch in gbp.conf & Vcs-Git URL.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 21 Mar 2017 12:49:51 +0100
+
 qgis (2.14.11+dfsg-2) unstable; urgency=medium
 
   * Add Breaks/Replaces on python-qt4 for QtWebKit.
diff -Nru qgis-2.14.11+dfsg/debian/control qgis-2.14.11+dfsg/debian/control
--- qgis-2.14.11+dfsg/debian/control	2017-02-13 18:37:20.000000000 +0100
+++ qgis-2.14.11+dfsg/debian/control	2017-03-21 12:49:51.000000000 +0100
@@ -68,7 +68,7 @@
                  qgis-dev
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/qgis.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/qgis.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/qgis.git -b stretch
 Homepage: https://qgis.org/
 X-Python-Version: >= 2.7, << 2.8
 
diff -Nru qgis-2.14.11+dfsg/debian/gbp.conf qgis-2.14.11+dfsg/debian/gbp.conf
--- qgis-2.14.11+dfsg/debian/gbp.conf	2017-01-25 10:22:19.000000000 +0100
+++ qgis-2.14.11+dfsg/debian/gbp.conf	2017-03-21 12:49:51.000000000 +0100
@@ -6,7 +6,7 @@
 
 # The default name for the Debian branch is "master".
 # Change it if the name is different (for instance, "debian/unstable").
-debian-branch = master
+debian-branch = stretch
 
 # git-import-orig uses the following names for the upstream tags.
 # Change the value if you are not using git-import-orig
diff -Nru qgis-2.14.11+dfsg/debian/patches/grass72.patch qgis-2.14.11+dfsg/debian/patches/grass72.patch
--- qgis-2.14.11+dfsg/debian/patches/grass72.patch	1970-01-01 01:00:00.000000000 +0100
+++ qgis-2.14.11+dfsg/debian/patches/grass72.patch	2017-03-21 12:48:03.000000000 +0100
@@ -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 -Nru qgis-2.14.11+dfsg/debian/patches/series qgis-2.14.11+dfsg/debian/patches/series
--- qgis-2.14.11+dfsg/debian/patches/series	2017-02-13 18:42:44.000000000 +0100
+++ qgis-2.14.11+dfsg/debian/patches/series	2017-03-21 12:48:03.000000000 +0100
@@ -8,3 +8,4 @@
 qtermwidget-hurd.patch
 qt4-without-qtwebkit.patch
 columns-typo.patch
+grass72.patch