Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
debian packaging: depend on grass abi
(cherry picked from commit a7d1a66)
  • Loading branch information
jef-n committed Sep 27, 2017
1 parent d3d8f4d commit ac890ba
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 2 additions & 1 deletion debian/control.in
Expand Up @@ -304,7 +304,8 @@ Depends:
qgis-provider-grass (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends},
grass-core
grass-core,
grass{GRASSABI}
Replaces: qgis-provider-grass (<< 1:2.11.0+git20151002)
Conflicts: qgis-provider-grass (<< 1:2.11.0+git20151002)
Description: GRASS plugin for QGIS
Expand Down
2 changes: 2 additions & 0 deletions debian/rules
Expand Up @@ -52,6 +52,7 @@ QGIS_PATCH=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_PATCH "\([0-9]*\)")/\1/p
QGIS_ABI=$(QGIS_MAJOR).$(QGIS_MINOR).$(QGIS_PATCH)
GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2))
GRASSVER=$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1))
GRASSABI=$(subst .,,$(shell pkg-config --modversion grass))

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)

Expand Down Expand Up @@ -239,6 +240,7 @@ $(2): $(1)
-e "s/\{QGIS_ABI\}/$(QGIS_ABI)/g" \
-e "s/\{GRASS\}/$(GRASS)/g" \
-e "s/\{GRASSVER\}/$(GRASSVER)/g" \
-e "s/\{GRASSABI\}/$(GRASSABI)/g" \
-e "s/\{GRASSVER_QGISABI\}/$(GRASSVER)-$(QGIS_ABI)/g" \
$$^ >$$@

Expand Down

0 comments on commit ac890ba

Please sign in to comment.