diff options
| author | Julien Cristau <[email protected]> | 2007-04-20 05:52:20 +0200 |
|---|---|---|
| committer | Julien Cristau <[email protected]> | 2007-04-20 05:52:20 +0200 |
| commit | 78fd17907e4b74dc538134337a794c4e3fa168a8 (patch) | |
| tree | 70ebe7d438aa7a4bc67b6d2c06bcfaa3acc59977 /debian/control | |
| parent | 47edc830808318c9a4761b799c70d7891626effd (diff) | |
| parent | 3832ecadae815bd59e03c55c3431e6565491a9e0 (diff) | |
Merge branch 'debian-experimental' into debian-unstable
Diffstat (limited to 'debian/control')
| -rw-r--r-- | debian/control | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/debian/control b/debian/control index 8400b0414ae..c6f0de3d584 100644 --- a/debian/control +++ b/debian/control @@ -302,7 +302,6 @@ Package: libglw1-mesa Section: libs Architecture: any Depends: ${shlibs:Depends} -Conflicts: libgl1-mesa-swx11 (<< 6.5.2-4) Provides: libglw1 Description: A free implementation of the OpenGL API -- runtime Mesa is a 3-D graphics library with an API which is very similar to @@ -322,7 +321,7 @@ Section: libdevel Architecture: any Depends: libglw1-mesa (= ${binary:Version}), libc6-dev, libx11-dev, libxext6, mesa-common-dev (= ${source:Version}) Provides: mesag3-widgets, mesag-widgets-dev, libglw-dev -Conflicts: libgl1-mesa-swx11-dev (<< 6.5.2-4) +Conflicts: libglw-dev, libgl1-mesa-swx11-dev (<< 6.5.2-4) Replaces: libglw-dev Description: A free implementation of the OpenGL API -- development support files This package provides the development environment required for |