[qgis] 01/01: Override dh_gencontrol to set GRASS ABI dependency with substvars.

Bas Couwenberg sebastic at debian.org
Sun Nov 5 09:57:39 UTC 2017


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

sebastic pushed a commit to branch master
in repository qgis.

commit b1ed94f049bc94d1534459c074c550c8c1825c17
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Nov 5 10:57:32 2017 +0100

    Override dh_gencontrol to set GRASS ABI dependency with substvars.
---
 debian/changelog | 6 ++++++
 debian/control   | 6 +++---
 debian/rules     | 3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3e4be81..fc98d0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qgis (2.14.20+dfsg-2) UNRELEASED; urgency=medium
+
+  * Override dh_gencontrol to set GRASS ABI dependency with substvars.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 05 Nov 2017 10:55:11 +0100
+
 qgis (2.14.20+dfsg-1) unstable; urgency=medium
 
   * Update symbols for other architectures.
diff --git a/debian/control b/debian/control
index c181651..cae0d22 100644
--- a/debian/control
+++ b/debian/control
@@ -287,10 +287,10 @@ Architecture: any
 Depends: qgis (= ${binary:Version}),
          qgis-plugin-grass-common (= ${source:Version}),
          qgis-provider-grass (= ${binary:Version}),
-         ${shlibs:Depends},
-         ${misc:Depends},
          grass-core (>= 7.2.0),
-         grass722
+         ${grass:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
 Breaks: qgis-provider-grass (<< 2.11.0+git20151002)
 Replaces: qgis-provider-grass (<< 2.11.0+git20151002)
 Description: GRASS plugin for QGIS
diff --git a/debian/rules b/debian/rules
index 163b96b..c75e0b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -342,3 +342,6 @@ endif
 override_dh_strip:
 	dh_strip --dbg-package=qgis-dbg
 
+override_dh_gencontrol:
+	dh_gencontrol -- -Vgrass:Depends="$(GRASSABI)"
+

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



More information about the Pkg-grass-devel mailing list