[qgis] 04/06: Update grass dependencies to prevent building with unsupported GRASS 7.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository qgis.

commit 77c281343e306e4b0ad183d1cd8d43a5b59e69b4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Feb 27 01:11:03 2015 +0100

    Update grass dependencies to prevent building with unsupported GRASS 7.
---
 debian/changelog | 1 +
 debian/control   | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7b3b9dc..bafea9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qgis (2.8.1-1) UNRELEASED; urgency=medium
 
   [ Bas Couwenberg ]
   * New upstream release.
+  * Update grass dependencies to prevent building with unsupported GRASS 7.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 27 Feb 2015 01:00:18 +0100
 
diff --git a/debian/control b/debian/control
index 54c6d15..21408c1 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: bison,
                cmake (>= 2.8),
                debhelper (>= 9),
                flex,
-               grass-dev,
+               grass-dev (<< 7),
                libexpat1-dev,
                libfcgi-dev,
                libgdal-dev (>= 1.10.1-0~),
@@ -190,7 +190,7 @@ Description: QGIS - shared server library
 Package: libqgis-dev
 Architecture: any
 Section: libdevel
-Depends: grass-dev,
+Depends: grass-dev (<< 7),
          libexpat1-dev,
          libgdal-dev (>= 1.10.1-0~),
          libgeos-dev (>= 3.0.0),
@@ -204,7 +204,7 @@ Depends: grass-dev,
          libqgis-server2.8.0 (= ${binary:Version}),
          libqgisgrass2.8.0 (= ${binary:Version}),
          libqgispython2.8.0 (= ${binary:Version}),
-         libqt4-dev (>= 4.6.0),
+         libqt4-dev (>= 4.7.0),
          libsqlite3-dev,
          python-qt4 (>= 4.1.0),
          python-qt4-dev (>= 4.1.0),
@@ -226,7 +226,7 @@ Depends: qgis (= ${binary:Version}),
          qgis-plugin-grass-common (= ${source:Version}),
          ${shlibs:Depends},
          ${misc:Depends},
-         grass64
+         grass-core (<< 7)
 Description: GRASS plugin for QGIS
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.

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