[SCM] Qt 4 packaging branch, master, updated. debian/4.8.5+dfsg-2-4-g235364e

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=235364e

The following commit has been merged in the master branch:
commit 235364ecb984e051ae6ca468d09fc4adc540d23e
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Aug 7 13:28:21 2013 -0300

    Change libqt4-opengl-dev dependency on libgl1-mesa-dev.
    
    Allows other implementations of libgl1 to be used.
---
 debian/changelog |    3 +++
 debian/control   |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 46472ac..6296747 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qt4-x11 (4:4.8.5+dfsg-3) UNRELEASED; urgency=low
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Add Add-support-for-the-Linux-m68k-platform.patch for supporting the m68k
     architecture (Closes: 660963).
+  * Change libqt4-opengl-dev dependency on libgl1-mesa-dev to
+    libgl1-mesa-dev | libgl1-dev, thus allowing other implementations of
+    libgl1 to be used (Closes: #718992).
 
   [ Pino Toscano ]
   * Fix description of qtcore4-l10n. (Closes: #717013)
diff --git a/debian/control b/debian/control
index 76ad410..2efea3d 100644
--- a/debian/control
+++ b/debian/control
@@ -590,7 +590,7 @@ Description: Qt 4 private development files
 Package: libqt4-opengl-dev
 Architecture: any
 Section: libdevel
-Depends: libgl1-mesa-dev,
+Depends: libgl1-mesa-dev | libgl1-dev,
          libglu1-mesa-dev,
          libqt4-dev (= ${binary:Version}),
          libqt4-opengl (= ${binary:Version}),

-- 
Qt 4 packaging