debian packaging update: also disable globe in sid-oracle

qgis · Jan 5, 2014 · d7237b7 · d7237b7 · m-kuhn · Jan 6, 2014
1 parent f0fc170
commit d7237b7
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 22 deletions.
diff --git a/debian/control.sid-oracle b/debian/control.sid-oracle
@@ -26,12 +26,12 @@ Build-Depends:
  pyqt4-dev-tools,
  python,
  python-dev (>= 2.6.6-3~),
- python-qt4 (>=4.1.0),
+ python-qt4 (>= 4.1.0),
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- libosgearth-dev,
- libopenscenegraph-dev,
+# libosgearth-dev,
+# libopenscenegraph-dev,
  git,
  doxygen,
  graphviz,
@@ -47,7 +47,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)
@@ -207,23 +208,23 @@ 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.
 
 Package: qgis-oracle-provider
 Architecture: any

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 jessie sid"))
+ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric jessie sid sid-oracle"))
 	CMAKE_OPTS += -D WITH_GLOBE=FALSE
 else
 	CMAKE_OPTS += -D WITH_GLOBE=TRUE