debian packaging: disable globe plugin on sid (apparently doesn't sup…

…port OSG 3.2 in sid yet)
qgis · Aug 18, 2013 · 78be54c · 78be54c
1 parent 8f00b9b
commit 78be54c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/debian/control.sid b/debian/control.sid
@@ -46,7 +46,8 @@ Homepage: http://qgis.org/
 Package: qgis
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
-Recommends: qgis-plugin-grass, python-qgis, qgis-plugin-globe
+Recommends: qgis-plugin-grass, python-qgis
+#, qgis-plugin-globe
 Suggests: gpsbabel
 Conflicts: uim-qt3
 Description: Geographic Information System (GIS)
@@ -206,21 +207,21 @@ Description: QGIS API documentation
  .
  This package contains the QGIS API documentation.
 
-Package: qgis-plugin-globe
-Architecture: any
-Depends: qgis (= ${binary:Version}), qgis-plugin-globe-common (= ${source:Version}), ${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
-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.
+#Package: qgis-plugin-globe
+#Architecture: any
+#Depends: qgis (= ${binary:Version}), qgis-plugin-globe-common (= ${source:Version}), ${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
+#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.
 
diff --git a/debian/rules b/debian/rules
@@ -78,7 +78,7 @@ ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric"))
 	CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=TRUE
 endif
 
-ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric"))
+ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric sid"))
 	CMAKE_OPTS += -D WITH_GLOBE=FALSE
 else
 	CMAKE_OPTS += -D WITH_GLOBE=TRUE