[SCM] qtbase packaging branch, master, updated. 0ce1f7449bcd61fa2611658f25cea7a48ade3958

[Fathi Boudra]

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

The following commit has been merged in the master branch:
commit 0ce1f7449bcd61fa2611658f25cea7a48ade3958
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Sep 4 08:42:37 2012 +0300

    Switch to GL ES 2 on armel/armhf architectures.
---
 debian/control |    7 +++++--
 debian/rules   |    2 --
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 358e443..a914a6e 100644
--- a/debian/control
+++ b/debian/control
@@ -17,9 +17,11 @@ Build-Depends: debhelper (>= 9),
                libfontconfig1-dev,
                libfreetype6-dev,
                libgl1-mesa-dev,
+               libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
                libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf],
                libglib2.0-dev,
                libglu1-mesa-dev,
+               libglu1-mesa-dev [!armel !armhf] | libglu-dev [!armel !armhf],
                libicu-dev,
                libjpeg-dev,
                libmysqlclient-dev,
@@ -257,8 +259,9 @@ Description: Qt 5 print support module
 Package: qtbase5-dev
 Architecture: any
 Section: libdevel
-Depends: libgl1-mesa-dev,
-         libglu1-mesa-dev,
+Depends: libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
+         libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf],
+         libglu1-mesa-dev [!armel !armhf] | libglu-dev [!armel !armhf],
          libqtconcurrent5 (= ${binary:Version}),
          libqtcore5 (= ${binary:Version}),
          libqtdbus5 (= ${binary:Version}),
diff --git a/debian/rules b/debian/rules
index 5b27377..457e990 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,8 +51,6 @@ endif
 
 ifeq ($(vendor),Ubuntu)
 gles2_architectures := armel armhf
-else
-gles2_architectures := none_for_now
 endif
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
 	extra_configure_opts += -opengl es2

-- 
qtbase packaging