diff options
| author | Julien Cristau <[email protected]> | 2009-04-18 22:28:35 +0200 |
|---|---|---|
| committer | Julien Cristau <[email protected]> | 2009-04-18 22:28:35 +0200 |
| commit | 909afc5304a24499b64579122bcc07abdb5747a3 (patch) | |
| tree | d15482f13bc250010a0fd7b1980929bd709dbd0c /debian | |
| parent | 4deb679b420fb97c80c2fb4a271f796ec256e119 (diff) | |
Adjust libgl1-mesa-glx and libgl1-mesa-dri package relationships
Drop the dependency on libgl1-mesa-glx from -dri, and make -glx
recommend -dri instead. The dri drivers are also loaded by the X
server, which doesn't need libGL. On the other hand, libGL needs one of
the dri drivers for direct rendering (either software or hardware).
Mark libgl1-mesa-dri as breaking old xserver-xorg-core and
libgl1-mesa-glx, to avoid incompatibilities.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index d17afc81b5c..d4ca3598feb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,12 @@ mesa (7.4-3) UNRELEASED; urgency=low * Install pkgconfig files for libGLU, libOSMesa and libGLw. * Make libgl1-mesa-dri 'Architecture: any', as swrast_dri.so should get built everywhere. + * Drop the dependency on libgl1-mesa-glx from -dri, and make -glx recommend + -dri instead. The dri drivers are also loaded by the X server, which + doesn't need libGL. On the other hand, libGL needs one of the dri drivers + for direct rendering (either software or hardware). Mark libgl1-mesa-dri + as breaking old xserver-xorg-core and libgl1-mesa-glx, to avoid + incompatibilities. -- Julien Cristau <[email protected]> Wed, 15 Apr 2009 19:25:50 +0200 diff --git a/debian/control b/debian/control index e012ca62e0e..eeec53b38cf 100644 --- a/debian/control +++ b/debian/control @@ -106,6 +106,7 @@ Package: libgl1-mesa-glx Section: libs Architecture: any Depends: ${shlibs:Depends} +Recommends: libgl1-mesa-dri (>= 7.2) Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0) Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0) Provides: libgl1 @@ -164,10 +165,11 @@ Package: libgl1-mesa-dri Section: libs Priority: optional Architecture: any -Depends: ${shlibs:Depends}, libgl1-mesa-glx (= ${binary:Version}) +Depends: ${shlibs:Depends} Suggests: libglide3 Conflicts: xlibmesa-dri (<< 1:7.0.0) Replaces: xlibmesa-dri (<< 1:7.0.0) +Breaks: xserver-xorg-core (<< 2:1.5), libgl1-mesa-glx (<< 7.2) Description: A free implementation of the OpenGL API -- DRI modules This version of Mesa provides GLX and DRI capabilities: it is capable of both direct and indirect rendering. For direct rendering, it can use DRI |