This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qgis.
commit 4c9cc4d536e9ad55e6c1ad018b9eb824d6c05315 Author: Bas Couwenberg <[email protected]> Date: Fri Jul 8 14:51:20 2016 +0200 Disable globe plugin, doesn't support osgEarth 2.7 properly. --- debian/changelog | 1 + debian/control | 51 ++++++++++++++++++++++++++------------------------- debian/rules | 2 +- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/debian/changelog b/debian/changelog index 20f88ea..509b87a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ qgis (2.14.4+dfsg-1) UNRELEASED; urgency=medium [ Bas Couwenberg ] * New upstream release. + * Disable globe plugin, doesn't support osgEarth 2.7 properly. -- Bas Couwenberg <[email protected]> Fri, 08 Jul 2016 14:35:23 +0200 diff --git a/debian/control b/debian/control index 5f591fb..ed3c243 100644 --- a/debian/control +++ b/debian/control @@ -78,9 +78,10 @@ Depends: ${shlibs:Depends}, python-qgis (= ${binary:Version}), qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version}) -Recommends: qgis-plugin-grass, - qgis-provider-grass, - qgis-plugin-globe +Recommends: +# qgis-plugin-globe, + qgis-plugin-grass, + qgis-provider-grass Suggests: gpsbabel Breaks: qgis-provider-grass (<< 2.14.0) Conflicts: uim-qt3 @@ -310,29 +311,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 +#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-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 aab3b49..9141b50 100755 --- a/debian/rules +++ b/debian/rules @@ -68,7 +68,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 _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
