File tree Expand file tree Collapse file tree 2 files changed +4
-1
lines changed Expand file tree Collapse file tree 2 files changed +4
-1
lines changed Original file line number Diff line number Diff line change @@ -304,7 +304,8 @@ Depends:
304
304
qgis-provider-grass (= ${binary:Version}),
305
305
${shlibs:Depends},
306
306
${misc:Depends},
307
- grass-core
307
+ grass-core,
308
+ grass{GRASSABI}
308
309
Replaces: qgis-provider-grass (<< 1:2.11.0+git20151002)
309
310
Conflicts: qgis-provider-grass (<< 1:2.11.0+git20151002)
310
311
Description: GRASS plugin for QGIS
Original file line number Diff line number Diff line change @@ -52,6 +52,7 @@ QGIS_PATCH=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_PATCH "\([0-9]*\)")/\1/p
52
52
QGIS_ABI =$(QGIS_MAJOR ) .$(QGIS_MINOR ) .$(QGIS_PATCH )
53
53
GRASS =grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2) )
54
54
GRASSVER =$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1) )
55
+ GRASSABI =$(subst .,,$(shell pkg-config --modversion grass) )
55
56
56
57
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)
57
58
@@ -239,6 +240,7 @@ $(2): $(1)
239
240
-e "s/\{QGIS_ABI\}/$(QGIS_ABI)/g" \
240
241
-e "s/\{GRASS\}/$(GRASS)/g" \
241
242
-e "s/\{GRASSVER\}/$(GRASSVER)/g" \
243
+ -e "s/\{GRASSABI\}/$(GRASSABI)/g" \
242
244
-e "s/\{GRASSVER_QGISABI\}/$(GRASSVER)-$(QGIS_ABI)/g" \
243
245
$$^ >$$@
244
246
You can’t perform that action at this time.
0 commit comments