[SCM] qtbase packaging branch, experimental, updated. debian/5.7.1+dfsg-3-5-g9b2f1bb

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=de5d64e

The following commit has been merged in the experimental branch:
commit de5d64ed16d2667310a2a64f2cb4725ae12825b2
Author: Alexander Volkov <a.volkov at rusbitech.ru>
Date:   Fri Feb 3 15:12:17 2017 +0300

    Remove debian/90qt5-opengl script, no longer needed.
    
    See https://bugs.debian.org/850705.
---
 debian/90qt5-opengl              | 21 ---------------------
 debian/changelog                 |  3 +++
 debian/libqt5gui5.install-common |  1 -
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/debian/90qt5-opengl b/debian/90qt5-opengl
deleted file mode 100644
index fe9a6cc..0000000
--- a/debian/90qt5-opengl
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- sh -*-
-# Xsession.d script to set the QT_XCB_FORCE_SOFTWARE_OPENGL env variable when
-# the user does not has at least OpenGL 2 support.
-#
-# This file is sourced by Xsession(5), not executed.
-
-if [ "$(which glxinfo)" = "" ] ; then
-    echo "To detect whether software based rendering is needed for Qt 5 the glxinfo program is a requirement but it was not found on this system."
-    echo "On Debian (based) systems, install the mesa-utils package."
-    #echo "On RedHat (based) systems, install the glx-utils package."
-else
-    OPENGL_VERSION=`LANG=C glxinfo | grep '^OpenGL version string: ' | head -n 1 | sed -e 's/^OpenGL version string: \([0-9]\).*$/
/g'`
-    if [ -n "$OPENGL_VERSION" ] && [ "$OPENGL_VERSION" -lt 2 ]; then
-        QT_XCB_FORCE_SOFTWARE_OPENGL=1
-        export QT_XCB_FORCE_SOFTWARE_OPENGL
-    elif [ -n "$OPENGL_VERSION" ] ; then
-        echo "OpenGL version: $OPENGL_VERSION."
-    else
-        echo "OpenGL version not found."
-    fi
-fi
diff --git a/debian/changelog b/debian/changelog
index 4ae3cda..427cde8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ qtbase-opensource-src (5.8.0+dfsg-1) UNRELEASED; urgency=medium
     - qsettings_XDG_CONFIG_DIRS.diff
   * Drop “-gstreamer 1.0” configuration option, dropped upstream.
 
+  [ Alexander Volkov ]
+  * Remove debian/90qt5-opengl script, no longer needed (refs: #850705).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 24 Jan 2017 14:24:16 +0300
 
 qtbase-opensource-src (5.7.1+dfsg-3) unstable; urgency=medium
diff --git a/debian/libqt5gui5.install-common b/debian/libqt5gui5.install-common
index a5bc7db..a14eb13 100644
--- a/debian/libqt5gui5.install-common
+++ b/debian/libqt5gui5.install-common
@@ -1,4 +1,3 @@
-debian/90qt5-opengl /etc/X11/Xsession.d
 usr/lib/*/libQt5Gui.so.*
 usr/lib/*/libQt5XcbQpa.so.*
 usr/lib/*/qt5/plugins/generic/libqtuiotouchplugin.so

-- 
qtbase packaging