diff options
| author | Julien Cristau <[email protected]> | 2007-07-23 16:28:10 +0200 |
|---|---|---|
| committer | Julien Cristau <[email protected]> | 2007-07-23 16:28:10 +0200 |
| commit | 490bd43f18f8f17ab7b8d5789944b50b3e5f598f (patch) | |
| tree | 1d1faf2d82f43c15f0c7f15ae21a5b9d7abaaefa /debian/control | |
| parent | 0511d9a9d21fcf4ce83cbb8db56f1a43e6d63b47 (diff) | |
| parent | 618626158977e8e46b050eb8610b95e3225fb2e5 (diff) | |
Merge branch 'debian-unstable' of git+ssh://git.debian.org/git/pkg-xorg/lib/mesa into debian-experimental
Conflicts:
debian/changelog
Diffstat (limited to 'debian/control')
| -rw-r--r-- | debian/control | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/control b/debian/control index 17f1e9ada06..0cfb97165d8 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5), quilt (>= 0.40), pkg-config, libdrm-dev (>= 2.2 Package: libgl1-mesa-swx11 Section: libs Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, libosmesa6 (>= 6.5.2-1) Conflicts: mesag3-glide, mesag3-glide2, mesag3+ggi, libgl1, nvidia-glx, mesag3, libgl1-mesa-swrast Provides: libgl1, mesag3, libgl1-mesa-swrast Replaces: libgl1, mesag3, libgl1-mesa-swrast @@ -213,7 +213,7 @@ Description: Debugging symbols for the Mesa DRI modules Package: libgl1-mesa-dev Section: libdevel Architecture: all -Depends: libc6-dev, mesa-common-dev (= ${source:Version}), libgl1-mesa-glx (>= ${Source-Version}), libgl1-mesa-dri (>= ${Source-Version}) +Depends: libc6-dev, mesa-common-dev (= ${source:Version}), libgl1-mesa-glx (>= ${source:Upstream-Version}) Conflicts: libgl-dev, libgl1-mesa-dri-dev Replaces: libgl-dev, libgl1-mesa-dri-dev Provides: libgl-dev, libgl1-mesa-dri-dev |