[qgis] 01/01: Rebuild 2.14.22+dfsg for xenial

[Martin Landa]

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

martinl-guest pushed a commit to branch ubuntu/xenial
in repository qgis.

commit 4b15266558f04800270008bb97cd0f67663f8605
Author: Martin Landa <landa.martin at gmail.com>
Date:   Sun Jan 28 15:49:20 2018 +0100

    Rebuild 2.14.22+dfsg for xenial
---
 debian/changelog | 7 +++++++
 debian/control   | 6 +++---
 debian/qgis.sh   | 4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 673a911..786bd42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qgis (2.14.22+dfsg-1~xenial2) xenial; urgency=medium
+
+  * Rebuild for xenial.
+  * Update packaging for GRASS 7.4.0.
+
+ -- Martin Landa <landa.martin at gmail.com>  Sun, 28 Jan 2018 15:11:30 +0100
+
 qgis (2.14.22+dfsg-1~xenial1) xenial; urgency=medium
 
   * Rebuild for xenial.
diff --git a/debian/control b/debian/control
index 5f5d92a..8d17eff 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: bison,
                dh-python,
                flex,
                gdal-bin,
-               grass-dev (>= 7.2.2),
+               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.2),
+Depends: grass-dev (>= 7.4.0),
          libexpat1-dev,
          libgdal-dev (>= 1.10.1-0~),
          libgeos-dev (>= 3.0.0),
@@ -268,7 +268,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/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