Skip to content

Commit a8f9f9f

Browse files
authoredSep 28, 2017
Merge branch 'master' into regularShape_gui
2 parents 8e4234c + 69f370e commit a8f9f9f

File tree

838 files changed

+2366
-3859
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

838 files changed

+2366
-3859
lines changed
 

‎debian/control.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,8 @@ Depends:
273273
qgis-provider-grass (= ${binary:Version}),
274274
${shlibs:Depends},
275275
${misc:Depends},
276-
grass-core
276+
grass-core,
277+
grass{GRASSABI}
277278
Description: GRASS plugin for QGIS
278279
QGIS is a Geographic Information System (GIS) which manages, analyzes and
279280
display databases of geographic information.

‎debian/rules

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

5859
CMAKE_OPTS := \
5960
-G Ninja \
@@ -187,6 +188,7 @@ $(2): $(1)
187188
-e "s/\{QGIS_ABI\}/$(QGIS_ABI)/g" \
188189
-e "s/\{GRASS\}/$(GRASS)/g" \
189190
-e "s/\{GRASSVER\}/$(GRASSVER)/g" \
191+
-e "s/\{GRASSABI\}/$(GRASSABI)/g" \
190192
-e "s/\{GRASSVER_QGISABI\}/$(GRASSVER)-$(QGIS_ABI)/g" \
191193
$$^ >$$@
192194

0 commit comments

Comments
 (0)