[qgis] 02/03: Update packing for GRASS 7.4.

[Bas Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository qgis.

commit e74b050ade6ccc3f922f2c2d1c3c27eb2a252ac5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Nov 17 12:33:52 2017 +0100

    Update packing for GRASS 7.4.
---
 debian/changelog             |  1 +
 debian/control               |  6 +++---
 debian/patches/grass72.patch | 15 ---------------
 debian/patches/grass74.patch | 14 ++++++++++++++
 debian/patches/series        |  2 +-
 debian/qgis.sh               |  4 ++--
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 42b03af..efa8747 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qgis (2.14.20+dfsg-2) UNRELEASED; urgency=medium
 
   * Override dh_gencontrol to set GRASS ABI dependency with substvars.
   * Strip trailing whitespace from changelog.
+  * Update packing for GRASS 7.4.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 05 Nov 2017 10:55:11 +0100
 
diff --git a/debian/control b/debian/control
index d853705..11a139b 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: bison,
                dh-python,
                flex,
                gdal-bin,
-               grass-dev (>= 7.2.0),
+               grass-dev (>= 7.4.0~),
                libexpat1-dev,
                libfcgi-dev,
                libgdal-dev (>= 1.10.1-0~),
@@ -218,7 +218,7 @@ Description: QGIS - shared server library
 Package: libqgis-dev
 Architecture: any
 Section: libdevel
-Depends: grass-dev (>= 7.2.0),
+Depends: grass-dev (>= 7.4.0~),
          libexpat1-dev,
          libgdal-dev (>= 1.10.1-0~),
          libgeos-dev (>= 3.0.0),
@@ -287,7 +287,7 @@ Architecture: any
 Depends: qgis (= ${binary:Version}),
          qgis-plugin-grass-common (= ${source:Version}),
          qgis-provider-grass (= ${binary:Version}),
-         grass-core (>= 7.2.0),
+         grass-core (>= 7.4.0~),
          ${grass:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
diff --git a/debian/patches/grass72.patch b/debian/patches/grass72.patch
deleted file mode 100644
index cb4a844..0000000
--- a/debian/patches/grass72.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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'))
diff --git a/debian/patches/grass74.patch b/debian/patches/grass74.patch
new file mode 100644
index 0000000..2b93df3
--- /dev/null
+++ b/debian/patches/grass74.patch
@@ -0,0 +1,14 @@
+Description: Add support for GRASS 7.4.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/python/plugins/processing/algs/grass7/Grass7Utils.py
++++ b/python/plugins/processing/algs/grass7/Grass7Utils.py
+@@ -84,7 +84,7 @@ class Grass7Utils:
+         if Grass7Utils.grassPath() is None:
+             return None
+ 
+-        for command in ["grass73", "grass72", "grass71", "grass70", "grass"]:
++        for command in ["grass74", "grass73", "grass72", "grass71", "grass70", "grass"]:
+             proc = subprocess.Popen(
+                 ["{} -v".format(command)],
+                 shell=True,
diff --git a/debian/patches/series b/debian/patches/series
index 47d4596..24dfa00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,4 @@ qtermwidget-kfreebsd.patch
 qtermwidget-hurd.patch
 qt4-without-qtwebkit.patch
 columns-typo.patch
-grass72.patch
+grass74.patch
diff --git a/debian/qgis.sh b/debian/qgis.sh
index f4038cb..f972fd5 100644
--- a/debian/qgis.sh
+++ b/debian/qgis.sh
@@ -2,9 +2,9 @@
 
 if dpkg -s qgis-plugin-grass >/dev/null 2>&1; then
 	if [ "$LD_LIBRARY_PATH" = "" ]; then
-		LD_LIBRARY_PATH=/usr/lib/grass72/lib
+		LD_LIBRARY_PATH=/usr/lib/grass74/lib
 	else
-		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass72/lib
+		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass74/lib
 	fi
 fi
 

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