[qgis] 04/06: Refresh patches.

[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 7b76b34e22875add77b31035bc501df6950f61bd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 22 12:49:35 2017 +0200

    Refresh patches.
---
 debian/changelog             |  1 +
 debian/patches/grass72.patch | 26 --------------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aa53f4a..0744be9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qgis (2.14.14+dfsg-1) UNRELEASED; urgency=medium
 
   [ Bas Couwenberg ]
   * New upstream release.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 22 Apr 2017 12:36:27 +0200
 
diff --git a/debian/patches/grass72.patch b/debian/patches/grass72.patch
index a36927f..cb4a844 100644
--- a/debian/patches/grass72.patch
+++ b/debian/patches/grass72.patch
@@ -13,29 +13,3 @@ Bug-Debian: https://bugs.debian.org/858251
  
      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/'

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