[cairo-commit] packaging/debian/cairo/debian control,1.23,1.24

[Dave Beckett]

Committed by: dajobe

Update of /cvs/cairo/packaging/debian/cairo/debian
In directory gabe:/tmp/cvs-serv22721

Modified Files:
	control 
Log Message:
conflict with libcairo1* << 0.5.0


Index: control
===================================================================
RCS file: /cvs/cairo/packaging/debian/cairo/debian/control,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- control	9 Jun 2005 19:49:03 -0000	1.23
+++ control	9 Jun 2005 19:55:27 -0000	1.24
@@ -2,15 +2,15 @@
 Section: libs
 Priority: optional
 Maintainer: Dave Beckett <dajobe at debian.org>
-Build-Depends: debhelper (>= 4.1.0), cdbs, autotools-dev, pkg-config, libpixman1-dev (>= 0.1.5), libfontconfig1-dev, libfreetype6-dev (>=2.1.0), libxrender-dev (>=0.6.0), libx11-dev, libpng12-dev, libglitz1-dev (>= 0.4.0)
+Build-Depends: debhelper (>= 4.1.0), cdbs, autotools-dev, pkg-config, libpixman1-dev (>= 0.1.4), libfontconfig1-dev, libfreetype6-dev (>=2.1.0), libxrender-dev (>=0.6.0), libx11-dev, libpng12-dev, libglitz1-dev (>= 0.4.0)
 Standards-Version: 3.6.1
 
 Package: libcairo0.5-dev
 Provides: libcairo-dev
-Conflicts: libcairo-dev, libcairo1-dev (<= 0.5.0)
+Conflicts: libcairo-dev, libcairo1-dev (<< 0.5.0)
 Section: libdevel
 Architecture: any
-Depends: libcairo0.5 (= ${Source-Version}), libpixman1-dev (>= 0.1.5), libfontconfig1-dev, libfreetype6-dev (>=2.1.0), libxrender-dev (>=0.6.0), libpng12-dev, libglitz1-dev (>= 0.4.0)
+Depends: libcairo0.5 (= ${Source-Version}), libpixman1-dev (>= 0.1.4), libfontconfig1-dev, libfreetype6-dev (>=2.1.0), libxrender-dev (>=0.6.0), libpng12-dev, libglitz1-dev (>= 0.4.0)
 Description: Multi-platform 2D graphics library
  Development libraries, header files and documentation needed by
  programs that want to compile with libcairo.
@@ -18,7 +18,7 @@
 Package: libcairo0.5
 Section: libs
 Architecture: any
-Conflicts: libcairo1 (<= 0.5.0)
+Conflicts: libcairo1 (<< 0.5.0)
 Depends: ${shlibs:Depends}
 Description: Multi-platform 2D graphics library
  Provides anti-aliased vector-based rendering for X. Paths consist