[qgis] 02/02: Drop qt5-globe-plugin.patch, included upstream. Refresh remaining patches.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch qt5
in repository qgis.

commit 5b91e2bce6965d366e236c6e1787f97ec88ce7b2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Mar 28 14:56:46 2016 +0200

    Drop qt5-globe-plugin.patch, included upstream. Refresh remaining patches.
---
 debian/patches/qt5-globe-plugin.patch              | 23 ----------------------
 ...-usage-of-QFtp-and-remove-from-Qt5-builds.patch |  2 +-
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/debian/patches/qt5-globe-plugin.patch b/debian/patches/qt5-globe-plugin.patch
deleted file mode 100644
index 7d02d1b..0000000
--- a/debian/patches/qt5-globe-plugin.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Add Qt5OpenGL include path for Qt5 build.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/qgis/QGIS/pull/2902
-Applied-Upstream: https://github.com/qgis/QGIS/commit/9167e1b6791a55cfbddc917ae56016e7e5c6896d
-
---- a/src/plugins/globe/CMakeLists.txt
-+++ b/src/plugins/globe/CMakeLists.txt
-@@ -55,6 +55,7 @@ QT4_ADD_RESOURCES(globe_plugin_RCC_SRCS
- ADD_LIBRARY (globeplugin MODULE ${globe_plugin_SRCS} ${globe_plugin_MOC_SRCS} ${globe_plugin_RCC_SRCS} ${globe_plugin_UIS_H})
- 
- INCLUDE_DIRECTORIES(SYSTEM
-+     ${Qt5OpenGL_INCLUDE_DIRS}
-      ${OSGEARTH_INCLUDE_DIR}
-      ${OSG_INCLUDE_DIR}
-      ${GEOS_INCLUDE_DIR}
-@@ -82,6 +83,7 @@ TARGET_LINK_LIBRARIES(globeplugin
-   qgis_core
-   qgis_gui
-   ${QT_QTOPENGL_LIBRARY}
-+  ${Qt5OpenGL_LIBRARIES}
-   ${OSGDB_LIBRARY}
-   ${OSGGA_LIBRARY}
-   ${OSGUTIL_LIBRARY}
diff --git a/debian/patches/qt5-server-deprecate-usage-of-QFtp-and-remove-from-Qt5-builds.patch b/debian/patches/qt5-server-deprecate-usage-of-QFtp-and-remove-from-Qt5-builds.patch
index 424c526..419bcd6 100644
--- a/debian/patches/qt5-server-deprecate-usage-of-QFtp-and-remove-from-Qt5-builds.patch
+++ b/debian/patches/qt5-server-deprecate-usage-of-QFtp-and-remove-from-Qt5-builds.patch
@@ -230,7 +230,7 @@ Subject: [qt5 server] deprecate usage of QFtp and remove from Qt5 builds
  QgsVectorLayer* QgsRemoteOWSBuilder::sosLayer( const QDomElement& remoteOWSElem, const QString& url, const QString& layerName, QList<QgsMapLayer*>& layersToRemove, bool allowCaching ) const
 --- a/src/server/qgsserverprojectparser.cpp
 +++ b/src/server/qgsserverprojectparser.cpp
-@@ -1398,7 +1398,7 @@ QList<QDomElement> QgsServerProjectParse
+@@ -1403,7 +1403,7 @@ QList<QDomElement> QgsServerProjectParse
    QDomElement wmsRestrictedComposersElem = propertiesElem.firstChildElement( "WMSRestrictedComposers" );
    if ( wmsRestrictedComposersElem.isNull() )
    {
diff --git a/debian/patches/series b/debian/patches/series
index 3368c24..14cff15 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@ developersmap-use-debian-package.patch
 exclude-elvensword-resources.patch
 occurred-typo.patch
 number-typo.patch
-qt5-globe-plugin.patch
 qt5-qspatialite.patch
 make-pyuic4-wrapper-PyQt5-aware.patch
 qt5-bindings.patch

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