From 04c002abc2ae6f69fe2ae36636247f62f61f0969 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Fri, 20 Apr 2007 05:53:59 +0200 Subject: Revert "Fix conflicts for libGLw packages." This reverts commit 048144074b54d15b3f514452c0fe7c72cba31a53. --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index c6f0de3d584..8400b0414ae 100644 --- a/debian/control +++ b/debian/control @@ -302,6 +302,7 @@ 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 @@ -321,7 +322,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: libglw-dev, libgl1-mesa-swx11-dev (<< 6.5.2-4) +Conflicts: 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 -- cgit v1.2.3