[qgis] 01/04: Disable globe plugin, fails to build with osgEarth 2.7.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository qgis.

commit 3759e84747b46f8f04a50c239ebc5ee18f0e500b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Mar 7 22:56:02 2016 +0100

    Disable globe plugin, fails to build with osgEarth 2.7.
---
 debian/changelog |  6 ++++++
 debian/control   | 50 +++++++++++++++++++++++++-------------------------
 debian/rules     |  2 +-
 3 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d251c9c..a9262d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qgis (2.14.0+dfsg0-1~exp2) UNRELEASED; urgency=medium
+
+  * Disable globe plugin, fails to build with osgEarth 2.7.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 07 Mar 2016 22:53:49 +0100
+
 qgis (2.14.0+dfsg0-1~exp1) experimental; urgency=medium
 
   [ Jürgen E. Fischer ]
diff --git a/debian/control b/debian/control
index d7394d8..6fa9dee 100644
--- a/debian/control
+++ b/debian/control
@@ -80,8 +80,8 @@ Depends: ${shlibs:Depends},
          qgis-providers (= ${binary:Version}),
          qgis-common (= ${source:Version})
 Recommends: qgis-plugin-grass,
-            qgis-provider-grass,
-            qgis-plugin-globe
+            qgis-provider-grass
+#,            qgis-plugin-globe
 Suggests: gpsbabel
 Conflicts: uim-qt3
 Description: Geographic Information System (GIS)
@@ -309,29 +309,29 @@ Description: GRASS plugin for QGIS - architecture-independent data
  This package contains architecture-independent supporting data files for use
  with the QGIS GRASS plugin.
 
-Package: qgis-plugin-globe
-Architecture: any
-Depends: qgis (= ${binary:Version}),
-         qgis-plugin-globe-common (= ${source:Version}),
-         openscenegraph-plugin-osgearth,
-         ${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
-Depends: osgearth-data,
-         ${misc:Depends}
-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}),
+#         openscenegraph-plugin-osgearth,
+#         ${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
+#Depends: osgearth-data,
+#         ${misc:Depends}
+#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: python-qgis
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 8ae2df1..f3b643b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,7 +65,7 @@ CMAKE_OPTS := \
 	-DQGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
 	-DWITH_APIDOC=TRUE \
 	-DWITH_CUSTOM_WIDGETS=TRUE \
-	-DWITH_GLOBE=TRUE \
+	-DWITH_GLOBE=FALSE \
 	-DWITH_INTERNAL_HTTPLIB2=FALSE \
 	-DWITH_INTERNAL_JINJA2=FALSE \
 	-DWITH_INTERNAL_MARKUPSAFE=FALSE \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git