[qgis] 04/12: Partially revert GRASS 7.4 changes to build with GRASS 7.2.

[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 748ceddf92883c538d30507b7bdb4d9cb2ed6f11
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Dec 8 22:56:53 2017 +0100

    Partially revert GRASS 7.4 changes to build with GRASS 7.2.
---
 debian/changelog | 1 +
 debian/control   | 6 +++---
 debian/qgis.sh   | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 58c82f1..8fda551 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qgis (2.14.21+dfsg-1) UNRELEASED; urgency=medium
 
   [ Bas Couwenberg ]
   * New upstream release.
+  * Partially revert GRASS 7.4 changes to build with GRASS 7.2.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 08 Dec 2017 22:44:28 +0100
 
diff --git a/debian/control b/debian/control
index a33d546..2385cfb 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: bison,
                dh-python,
                flex,
                gdal-bin,
-               grass-dev (>= 7.4.0~),
+               grass-dev (>= 7.2.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.4.0~),
+Depends: grass-dev (>= 7.2.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.4.0~),
+         grass-core (>= 7.2.0),
          ${grass:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
diff --git a/debian/qgis.sh b/debian/qgis.sh
index f972fd5..f4038cb 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/grass74/lib
+		LD_LIBRARY_PATH=/usr/lib/grass72/lib
 	else
-		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass74/lib
+		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass72/lib
 	fi
 fi
 

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