Skip to content

Commit ddcc2fb

Browse files
committedJun 1, 2016
debian packaging: disable globe plugin where osgearth >= 2.7
1 parent f6f2609 commit ddcc2fb

File tree

3 files changed

+39
-29
lines changed

3 files changed

+39
-29
lines changed
 

‎debian/control

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Build-Depends:
3131
python-dev,
3232
python-qt4-dev (>= 4.1.0),
3333
python-sip-dev (>= 4.5.0) | python-sip4-dev (>= 4.5.0) | sip4 (>= 4.5),
34+
libosgearth-dev,
3435
git,
3536
txt2tags,
3637
doxygen

‎debian/control.in

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ Depends:
8282
qgis-providers (= ${binary:Version}),
8383
qgis-common (= ${source:Version})
8484
Recommends:
85+
#globe# qgis-plugin-globe
8586
qgis-plugin-grass,
86-
qgis-provider-grass,
87-
qgis-plugin-globe
87+
qgis-provider-grass
8888
Suggests: gpsbabel
8989
Conflicts: uim-qt3
9090
Description: Geographic Information System (GIS)
@@ -339,32 +339,32 @@ Description: GRASS plugin for QGIS - architecture-independent data
339339
This package contains architecture-independent supporting data files for use
340340
with the QGIS GRASS plugin.
341341

342-
Package: qgis-plugin-globe
343-
Architecture: any
344-
Depends:
345-
qgis (= ${binary:Version}),
346-
qgis-plugin-globe-common (= ${source:Version}),
347-
openscenegraph-plugin-osgearth,
348-
${shlibs:Depends},
349-
${misc:Depends}
350-
Description: OSG globe plugin for QGIS
351-
QGIS is a Geographic Information System (GIS) which manages, analyzes and
352-
display databases of geographic information.
353-
.
354-
This plugin enables 3D viewing using OSG globe in the QGIS.
355-
356-
Package: qgis-plugin-globe-common
357-
Architecture: all
358-
Depends:
359-
osgearth-data,
360-
${misc:Depends}
361-
Description: OSG globe plugin for QGIS - architecture-independent data
362-
QGIS is a Geographic Information System (GIS) which manages, analyzes and
363-
display databases of geographic information.
364-
.
365-
This package contains architecture-independent supporting data files for use
366-
with the QGIS GLOBE plugin.
367-
342+
#globe#Package: qgis-plugin-globe
343+
#globe#Architecture: any
344+
#globe#Depends:
345+
#globe# qgis (= ${binary:Version}),
346+
#globe# qgis-plugin-globe-common (= ${source:Version}),
347+
#globe# openscenegraph-plugin-osgearth,
348+
#globe# ${shlibs:Depends},
349+
#globe# ${misc:Depends}
350+
#globe#Description: OSG globe plugin for QGIS
351+
#globe# QGIS is a Geographic Information System (GIS) which manages, analyzes and
352+
#globe# display databases of geographic information.
353+
#globe# .
354+
#globe# This plugin enables 3D viewing using OSG globe in the QGIS.
355+
#globe#
356+
#globe#Package: qgis-plugin-globe-common
357+
#globe#Architecture: all
358+
#globe#Depends:
359+
#globe# osgearth-data,
360+
#globe# ${misc:Depends}
361+
#globe#Description: OSG globe plugin for QGIS - architecture-independent data
362+
#globe# QGIS is a Geographic Information System (GIS) which manages, analyzes and
363+
#globe# display databases of geographic information.
364+
#globe# .
365+
#globe# This package contains architecture-independent supporting data files for use
366+
#globe# with the QGIS GLOBE plugin.
367+
#globe#
368368
Package: python-qgis
369369
Architecture: any
370370
Section: python

‎debian/rules

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ QGIS_ABI=$(QGIS_MAJOR).$(QGIS_MINOR).$(QGIS_PATCH)
5050
GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2))
5151
GRASSVER=$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1))
5252

53+
WITH_GLOBE=$(shell dpkg --compare-versions "$$(dpkg-query -W --showformat='$${Version}' libosgearth-dev)" lt 2.7 && echo 1)
54+
5355
CMAKE_OPTS := \
5456
-DBUILDNAME=$(DEB_BUILD_NAME) \
5557
-DCMAKE_VERBOSE_MAKEFILE=1 \
@@ -63,7 +65,6 @@ CMAKE_OPTS := \
6365
-DQGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
6466
-DWITH_APIDOC=TRUE \
6567
-DWITH_CUSTOM_WIDGETS=TRUE \
66-
-DWITH_GLOBE=TRUE \
6768
-DWITH_INTERNAL_HTTPLIB2=FALSE \
6869
-DWITH_INTERNAL_JINJA2=FALSE \
6970
-DWITH_INTERNAL_MARKUPSAFE=FALSE \
@@ -97,6 +98,10 @@ else
9798
CMAKE_OPTS += -DWITH_INTERNAL_NOSE2=FALSE -DWITH_INTERNAL_SIX=FALSE
9899
endif
99100

101+
ifneq (,$(WITH_GLOBE))
102+
CMAKE_OPTS += -DWITH_GLOBE=TRUE
103+
endif
104+
100105
ifneq (,$(findstring $(DISTRIBUTION),"wheezy precise"))
101106
CMAKE_OPTS += -DWITH_PYSPATIALITE=TRUE
102107
endif
@@ -181,6 +186,10 @@ endif
181186

182187
CONTROL_EXPRESSIONS = $(DISTRIBUTION) grass$(GRASSVER)
183188

189+
ifneq (,$(WITH_GLOBE))
190+
CONTROL_EXPRESSIONS += globe
191+
endif
192+
184193
ifneq (,$(WITH_ORACLE))
185194
CONTROL_EXPRESSIONS += oracle
186195
endif

0 commit comments

Comments
 (0)
Please sign in to comment.