[SCM] Qt 4 packaging branch, master, updated. debian/4.7.3-1-17-g160058b

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 6dd4907e1349138447eb2f538fda43c8276592be
Author: Fathi Boudra <fabo at debian.org>
Date:   Wed Jun 15 16:30:11 2011 +0300

    Fix GL library dependency on ARM architecture
---
 debian/control |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 52e71e9..b0b213e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,9 @@ Build-Depends: debhelper (>= 7.4.13), pkg-kde-tools (>= 0.6.4), flex,
  freetds-dev, g++ (>= 4:4.5) [s390], g++-4.6 (>= 4.6.0-7~) [armel],
  libasound2-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
  libaudio-dev, libcups2-dev, libdbus-1-dev, libfreetype6-dev,
- libgl1-mesa-dev | libgl-dev [!armel !armhf],
+ libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
  libglib2.0-dev,
- libglu1-mesa-dev | libglu-dev [!armel !armhf],
+ libglu1-mesa-dev [!armel !armhf] | libglu-dev [!armel !armhf],
  libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf],
  libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libgtk2.0-dev,
  libice-dev, unixodbc-dev, libjpeg-dev, libmng-dev, libmysqlclient-dev,
@@ -417,7 +417,9 @@ Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libqt4-opengl (= ${binary:Version}), libqt4-dev (= ${binary:Version}),
- libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev
+ libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
+ libglu1-mesa-dev [!armel !armhf] | libglu-dev [!armel !armhf],
+ libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf]
 Breaks: libqt4-dev (<< 4.4.0-2)
 Replaces: libqt4-dev (<< 4.4.0-2)
 Description: Qt 4 OpenGL library development files

-- 
Qt 4 packaging