diff options
| author | Cyril Brulebois <kibi@debian.org> | 2011-06-16 03:46:39 +0200 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2011-07-31 20:02:33 +0200 |
| commit | a9981311c2a1023fa1a1783dd15013c5ec704569 (patch) | |
| tree | eef761997fd486d6227f2cb71d6b74b04f3dd08a | |
| parent | 7890e14d855c247a59047a3197d779be40800a16 (diff) | |
Bump libgl1-mesa-dri versioned Recommends to 7.10.2-4.
This lowers the odds of having a server built against multiarched mesa,
installed along a pre-multiarch mesa. The Breaks in mesa packages take
care of the other way round already.
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 23ac61c7f..37fb2acdc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,11 @@ xorg-server (2:1.10.99.901+git20110731-1) UNRELEASED; urgency=low [ Julien Cristau ] * Update to git HEAD. * Bump xproto, dri2proto and glproto build-dependencies. + * Merge packaging changes from the 1.10.x branch: + + Bump libgl1-mesa-dri versioned Recommends to 7.10.2-4, to lower the + odds of having a server built against multiarched mesa, installed + along a pre-multiarch mesa. The Breaks in mesa packages take care of + the other way round already. -- Cyril Brulebois <kibi@debian.org> Tue, 31 May 2011 13:52:04 +0200 diff --git a/debian/control b/debian/control index cbd4d97aa..e66ee686b 100644 --- a/debian/control +++ b/debian/control @@ -89,7 +89,7 @@ Depends: udev (>= 149) [linux-any], ${shlibs:Depends}, ${misc:Depends}, -Recommends: libgl1-mesa-dri (>= 7.1~rc1) +Recommends: libgl1-mesa-dri (>= 7.10.2-4) Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable Breaks: xserver-xorg-video, |