Skip to content

Commit 8c14165

Browse files
committed
debian packaging: limit globe to osgearth 2.7
1 parent 1b2af79 commit 8c14165

File tree

3 files changed

+38
-29
lines changed

3 files changed

+38
-29
lines changed

debian/control

+1
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

+28-28
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ Depends:
8484
qgis-providers (= ${binary:Version}),
8585
qgis-common (= ${source:Version})
8686
Recommends:
87+
#globe# qgis-plugin-globe
8788
qgis-plugin-grass,
88-
qgis-provider-grass,
89-
qgis-plugin-globe
89+
qgis-provider-grass
9090
Suggests: gpsbabel
9191
Conflicts: uim-qt3
9292
Description: Geographic Information System (GIS)
@@ -341,32 +341,32 @@ Description: GRASS plugin for QGIS - architecture-independent data
341341
This package contains architecture-independent supporting data files for use
342342
with the QGIS GRASS plugin.
343343

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

debian/rules

+9-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ QGIS_ABI=$(QGIS_MAJOR).$(QGIS_MINOR).$(QGIS_PATCH)
5353
GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2))
5454
GRASSVER=$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1))
5555

56+
WITH_GLOBE=$(shell dpkg --compare-versions "$$(dpkg-query -W --showformat='$${Version}' libosgearth-dev)" ge 2.7 && echo 1)
57+
5658
CMAKE_OPTS := \
5759
-DBUILDNAME=$(DEB_BUILD_NAME) \
5860
-DCMAKE_VERBOSE_MAKEFILE=1 \
@@ -67,7 +69,6 @@ CMAKE_OPTS := \
6769
-DWITH_APIDOC=TRUE \
6870
-DGENERATE_QHP=TRUE \
6971
-DWITH_CUSTOM_WIDGETS=TRUE \
70-
-DWITH_GLOBE=TRUE \
7172
-DWITH_INTERNAL_HTTPLIB2=FALSE \
7273
-DWITH_INTERNAL_JINJA2=FALSE \
7374
-DWITH_INTERNAL_MARKUPSAFE=FALSE \
@@ -111,6 +112,9 @@ else
111112
CMAKE_OPTS += -DWITH_INTERNAL_FUTURE=FALSE
112113
endif
113114

115+
ifneq (,$(WITH_GLOBE))
116+
CMAKE_OPTS += -DWITH_GLOBE=TRUE
117+
endif
114118

115119
ifneq (,$(findstring $(DISTRIBUTION),"wheezy precise"))
116120
CMAKE_OPTS += -DWITH_PYSPATIALITE=TRUE
@@ -198,6 +202,10 @@ endif
198202

199203
CONTROL_EXPRESSIONS = $(DISTRIBUTION) grass$(GRASSVER)
200204

205+
ifneq (,$(WITH_GLOBE))
206+
CONTROL_EXPRESSIONS += globe
207+
endif
208+
201209
ifneq (,$(WITH_ORACLE))
202210
CONTROL_EXPRESSIONS += oracle
203211
endif

0 commit comments

Comments
 (0)