Skip to content

Commit

Permalink
debian packaging: disable globe plugin where osgearth >= 2.7
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jun 1, 2016
1 parent f6f2609 commit ddcc2fb
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 29 deletions.
1 change: 1 addition & 0 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Build-Depends:
python-dev,
python-qt4-dev (>= 4.1.0),
python-sip-dev (>= 4.5.0) | python-sip4-dev (>= 4.5.0) | sip4 (>= 4.5),
libosgearth-dev,
git,
txt2tags,
doxygen
Expand Down
56 changes: 28 additions & 28 deletions debian/control.in
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ Depends:
qgis-providers (= ${binary:Version}),
qgis-common (= ${source:Version})
Recommends:
#globe# qgis-plugin-globe
qgis-plugin-grass,
qgis-provider-grass,
qgis-plugin-globe
qgis-provider-grass
Suggests: gpsbabel
Conflicts: uim-qt3
Description: Geographic Information System (GIS)
Expand Down Expand Up @@ -339,32 +339,32 @@ Description: GRASS plugin for QGIS - architecture-independent data
This package contains architecture-independent supporting data files for use
with the QGIS GRASS plugin.

Package: qgis-plugin-globe
Architecture: any
Depends:
qgis (= ${binary:Version}),
qgis-plugin-globe-common (= ${source:Version}),
openscenegraph-plugin-osgearth,
${shlibs:Depends},
${misc:Depends}
Description: OSG globe plugin for QGIS
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This plugin enables 3D viewing using OSG globe in the QGIS.

Package: qgis-plugin-globe-common
Architecture: all
Depends:
osgearth-data,
${misc:Depends}
Description: OSG globe plugin for QGIS - architecture-independent data
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains architecture-independent supporting data files for use
with the QGIS GLOBE plugin.

#globe#Package: qgis-plugin-globe
#globe#Architecture: any
#globe#Depends:
#globe# qgis (= ${binary:Version}),
#globe# qgis-plugin-globe-common (= ${source:Version}),
#globe# openscenegraph-plugin-osgearth,
#globe# ${shlibs:Depends},
#globe# ${misc:Depends}
#globe#Description: OSG globe plugin for QGIS
#globe# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#globe# display databases of geographic information.
#globe# .
#globe# This plugin enables 3D viewing using OSG globe in the QGIS.
#globe#
#globe#Package: qgis-plugin-globe-common
#globe#Architecture: all
#globe#Depends:
#globe# osgearth-data,
#globe# ${misc:Depends}
#globe#Description: OSG globe plugin for QGIS - architecture-independent data
#globe# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#globe# display databases of geographic information.
#globe# .
#globe# This package contains architecture-independent supporting data files for use
#globe# with the QGIS GLOBE plugin.
#globe#
Package: python-qgis
Architecture: any
Section: python
Expand Down
11 changes: 10 additions & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ 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))

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

CMAKE_OPTS := \
-DBUILDNAME=$(DEB_BUILD_NAME) \
-DCMAKE_VERBOSE_MAKEFILE=1 \
Expand All @@ -63,7 +65,6 @@ CMAKE_OPTS := \
-DQGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
-DWITH_APIDOC=TRUE \
-DWITH_CUSTOM_WIDGETS=TRUE \
-DWITH_GLOBE=TRUE \
-DWITH_INTERNAL_HTTPLIB2=FALSE \
-DWITH_INTERNAL_JINJA2=FALSE \
-DWITH_INTERNAL_MARKUPSAFE=FALSE \
Expand Down Expand Up @@ -97,6 +98,10 @@ else
CMAKE_OPTS += -DWITH_INTERNAL_NOSE2=FALSE -DWITH_INTERNAL_SIX=FALSE
endif

ifneq (,$(WITH_GLOBE))
CMAKE_OPTS += -DWITH_GLOBE=TRUE
endif

ifneq (,$(findstring $(DISTRIBUTION),"wheezy precise"))
CMAKE_OPTS += -DWITH_PYSPATIALITE=TRUE
endif
Expand Down Expand Up @@ -181,6 +186,10 @@ endif

CONTROL_EXPRESSIONS = $(DISTRIBUTION) grass$(GRASSVER)

ifneq (,$(WITH_GLOBE))
CONTROL_EXPRESSIONS += globe
endif

ifneq (,$(WITH_ORACLE))
CONTROL_EXPRESSIONS += oracle
endif
Expand Down

0 comments on commit ddcc2fb

Please sign in to comment.