Skip to content

Commit ac890ba

Browse files
committedSep 27, 2017
debian packaging: depend on grass abi
(cherry picked from commit a7d1a66)
1 parent d3d8f4d commit ac890ba

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed
 

‎debian/control.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,8 @@ Depends:
304304
qgis-provider-grass (= ${binary:Version}),
305305
${shlibs:Depends},
306306
${misc:Depends},
307-
grass-core
307+
grass-core,
308+
grass{GRASSABI}
308309
Replaces: qgis-provider-grass (<< 1:2.11.0+git20151002)
309310
Conflicts: qgis-provider-grass (<< 1:2.11.0+git20151002)
310311
Description: GRASS plugin for QGIS

‎debian/rules

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ QGIS_PATCH=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_PATCH "\([0-9]*\)")/\1/p
5252
QGIS_ABI=$(QGIS_MAJOR).$(QGIS_MINOR).$(QGIS_PATCH)
5353
GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2))
5454
GRASSVER=$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1))
55+
GRASSABI=$(subst .,,$(shell pkg-config --modversion grass))
5556

5657
WITH_GLOBE=$(shell dpkg --compare-versions "$$(dpkg-query -W --showformat='$${Version}' libosgearth-dev)" ge 2.7 && dpkg --compare-versions "$$(dpkg-query -W --showformat='$${Version}' libosgearth-dev)" lt 2.8 && echo 1)
5758

@@ -239,6 +240,7 @@ $(2): $(1)
239240
-e "s/\{QGIS_ABI\}/$(QGIS_ABI)/g" \
240241
-e "s/\{GRASS\}/$(GRASS)/g" \
241242
-e "s/\{GRASSVER\}/$(GRASSVER)/g" \
243+
-e "s/\{GRASSABI\}/$(GRASSABI)/g" \
242244
-e "s/\{GRASSVER_QGISABI\}/$(GRASSVER)-$(QGIS_ABI)/g" \
243245
$$^ >$$@
244246

0 commit comments

Comments
 (0)
Please sign in to comment.