Skip to content

Commit 78be54c

Browse files
committed
debian packaging: disable globe plugin on sid (apparently doesn't support OSG 3.2 in sid yet)
1 parent 8f00b9b commit 78be54c

File tree

2 files changed

+20
-19
lines changed

2 files changed

+20
-19
lines changed

debian/control.sid

+19-18
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ Homepage: http://qgis.org/
4646
Package: qgis
4747
Architecture: any
4848
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
49-
Recommends: qgis-plugin-grass, python-qgis, qgis-plugin-globe
49+
Recommends: qgis-plugin-grass, python-qgis
50+
#, qgis-plugin-globe
5051
Suggests: gpsbabel
5152
Conflicts: uim-qt3
5253
Description: Geographic Information System (GIS)
@@ -206,21 +207,21 @@ Description: QGIS API documentation
206207
.
207208
This package contains the QGIS API documentation.
208209

209-
Package: qgis-plugin-globe
210-
Architecture: any
211-
Depends: qgis (= ${binary:Version}), qgis-plugin-globe-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
212-
Description: OSG globe plugin for QGIS
213-
QGIS is a Geographic Information System (GIS) which manages, analyzes and
214-
display databases of geographic information.
215-
.
216-
This plugin enables 3D viewing using OSG globe in the QGIS.
217-
218-
Package: qgis-plugin-globe-common
219-
Architecture: all
220-
Description: OSG GLOBE plugin for QGIS - architecture-independent data
221-
QGIS is a Geographic Information System (GIS) which manages, analyzes and
222-
display databases of geographic information.
223-
.
224-
This package contains architecture-independent supporting data files for use
225-
with the QGIS GLOBE plugin.
210+
#Package: qgis-plugin-globe
211+
#Architecture: any
212+
#Depends: qgis (= ${binary:Version}), qgis-plugin-globe-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
213+
#Description: OSG globe plugin for QGIS
214+
# QGIS is a Geographic Information System (GIS) which manages, analyzes and
215+
# display databases of geographic information.
216+
# .
217+
# This plugin enables 3D viewing using OSG globe in the QGIS.
218+
219+
#Package: qgis-plugin-globe-common
220+
#Architecture: all
221+
#Description: OSG GLOBE plugin for QGIS - architecture-independent data
222+
# QGIS is a Geographic Information System (GIS) which manages, analyzes and
223+
# display databases of geographic information.
224+
# .
225+
# This package contains architecture-independent supporting data files for use
226+
# with the QGIS GLOBE plugin.
226227

debian/rules

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric"))
7878
CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=TRUE
7979
endif
8080

81-
ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric"))
81+
ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric sid"))
8282
CMAKE_OPTS += -D WITH_GLOBE=FALSE
8383
else
8484
CMAKE_OPTS += -D WITH_GLOBE=TRUE

0 commit comments

Comments
 (0)