summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2013-08-07 13:28:21 -0300
committerLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2013-08-07 13:28:21 -0300
commit235364ecb984e051ae6ca468d09fc4adc540d23e (patch)
treee4b8b23bb709d0c44baadfbb524e5212cbc00365
parente227134b7e334ea29800c7bed765eab637b5b9b2 (diff)
downloadqt4-x11-235364ecb984e051ae6ca468d09fc4adc540d23e.tar.gz
Change libqt4-opengl-dev dependency on libgl1-mesa-dev.
Allows other implementations of libgl1 to be used.
-rw-r--r--debian/changelog3
-rw-r--r--debian/control2
2 files changed, 4 insertions, 1 deletions
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}),