[SCM] Qt 4 packaging branch, master, updated. debian/4.7.3-4-3-g5926ce4

[Pino Toscano]

The following commit has been merged in the master branch:
commit 5926ce498ebdd10be7a30d99a18b1bd1c7fd0520
Author: Pino Toscano <pino at kde.org>
Date:   Tue Jul 5 13:19:54 2011 +0200

    revert the switch to GL ES 2 on armel and armhf architectures for now (#632602)
    
    it is binary incompatible and creates issues with code explicitly using GL API
---
 debian/changelog |    5 +++++
 debian/control   |   10 ++++------
 debian/rules     |    2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78442f5..9aeb4b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ qt4-x11 (4:4.7.3-5) UNRELEASED; urgency=low
   [ Fathi Boudra ]
   * Add support for vendor specifics in debian/rules.
 
+  [ Pino Toscano ]
+  * Revert the switch to GL ES 2 on armel and armhf architectures for now,
+    as it is binary incompatible and creates issues with code explicitly
+    using GL API. (Closes: #632602)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 27 Jun 2011 09:15:29 +0300
 
 qt4-x11 (4:4.7.3-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b22e6d8..315718b 100644
--- a/debian/control
+++ b/debian/control
@@ -16,10 +16,9 @@ Build-Depends: debhelper (>= 7.4.13),
                libcups2-dev,
                libdbus-1-dev,
                libfreetype6-dev,
-               libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
-               libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf],
+               libgl1-mesa-dev,
                libglib2.0-dev,
-               libglu1-mesa-dev [!armel !armhf] | libglu-dev [!armel !armhf],
+               libglu1-mesa-dev,
                libgstreamer-plugins-base0.10-dev,
                libgstreamer0.10-dev,
                libgtk2.0-dev,
@@ -492,9 +491,8 @@ Description: Qt 4 private development files
 Package: libqt4-opengl-dev
 Architecture: any
 Section: libdevel
-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],
+Depends: libgl1-mesa-dev,
+         libglu1-mesa-dev,
          libqt4-dev (= ${binary:Version}),
          libqt4-opengl (= ${binary:Version}),
          ${misc:Depends},
diff --git a/debian/rules b/debian/rules
index f5cedb5..d4a3f44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,7 @@ ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(armv6_architectures)))
 	extra_configure_opts += -arch armv6
 endif
 
-gles2_architectures := armel armhf
+gles2_architectures := none_for_now
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
 	extra_configure_opts += -opengl es2
 else

-- 
Qt 4 packaging