[SCM] qtbase packaging branch, master, updated. debian/5.0.2+dfsg1-2-10-g0055efa

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit 0055efac5e12f0b08176e3271ecfe4c7a4d257c6
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Apr 22 08:31:21 2013 +0000

    Use -opengl es2 on arm, support EGL also on desktop.
    
    Drop the Ubuntu specifity of selecting -opengl es2 on arm.
    OpenGL ES is the best choice on arm, even though some arm machines
    may support full OpenGL as well.
    
    Install all build dependencies on all platforms, since desktop
    can also support EGL and arm can also support GLX. Drop the -no-egl .
---
 debian/changelog |    4 ++++
 debian/control   |    6 +++---
 debian/rules     |    5 +----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f225275..39cc621 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,10 @@ qtbase-opensource-src (5.0.2+dfsg1-3) UNRELEASED; urgency=low
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Update symbols files for hurd-i386, i386, ia64 and powerpc.
 
+  [ Timo Jyrinki ]
+  * Use -opengl es2 correctly on arm
+  * Allow EGL support also on desktop
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 21 Apr 2013 10:01:11 +0200
 
 qtbase-opensource-src (5.0.2+dfsg1-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index e911161..434975a 100644
--- a/debian/control
+++ b/debian/control
@@ -18,10 +18,10 @@ Build-Depends: debhelper (>= 9),
                libdbus-1-dev,
                libfontconfig1-dev,
                libfreetype6-dev,
-               libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
-               libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf],
+               libgl1-mesa-dev | libgl-dev,
+               libgles2-mesa-dev | libgles2-dev,
                libglib2.0-dev,
-               libglu1-mesa-dev [!armel !armhf] | libglu-dev [!armel !armhf],
+               libglu1-mesa-dev | libglu-dev,
                libicu-dev,
                libjpeg-dev,
                libmysqlclient-dev,
diff --git a/debian/rules b/debian/rules
index 44d8dc9..024dd9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,14 +61,11 @@ ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(armv6_architectures)))
 	extra_configure_opts += -arch armv6
 endif
 
-ifeq ($(vendor),Ubuntu)
 gles2_architectures := armel armhf
-endif
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
 	extra_configure_opts += -opengl es2
 else
-	extra_configure_opts += -opengl desktop \
-	                        -no-egl
+	extra_configure_opts += -opengl desktop
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)

-- 
qtbase packaging