[cairo-commit] packaging/debian/cairo/debian changelog, 1.29, 1.30 control.in, 1.2, 1.3

[Dave Beckett]

Committed by: dajobe

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

Modified Files:
	changelog control.in 
Log Message:
amend 0.9.0-1 replaces

Index: changelog
===================================================================
RCS file: /cvs/cairo/packaging/debian/cairo/debian/changelog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- changelog	9 Aug 2005 07:11:52 -0000	1.29
+++ changelog	9 Aug 2005 07:25:02 -0000	1.30
@@ -4,7 +4,7 @@
   * libcairo0.9.0 replaces libcairo0.6.0
   * Functions were added so create new sonames and libraries
 
- -- Dave Beckett <dajobe at debian.org>  Tue,  9 Aug 2005 08:05:54 +0100
+ -- Dave Beckett <dajobe at debian.org>  Tue,  9 Aug 2005 08:21:50 +0100
 
 libcairo (0.6.0-1) unstable; urgency=low
 

Index: control.in
===================================================================
RCS file: /cvs/cairo/packaging/debian/cairo/debian/control.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- control.in	9 Aug 2005 07:11:52 -0000	1.2
+++ control.in	9 Aug 2005 07:25:02 -0000	1.3
@@ -7,7 +7,8 @@
 
 Package: libcairo at UPVERSION@-dev
 Provides: libcairo-dev
-Conflicts: libcairo-dev, libcairo1-dev (<< 0.5.0), libcairo0.5.1-dev, libcairo0.6.0-dev
+Conflicts: libcairo-dev, libcairo0.5.1-dev, libcairo0.6.0-dev
+Replaces: libcairo0.5.1-dev, libcairo0.6.0-dev
 Suggests: libcairo at UPVERSION@-doc
 Section: libdevel
 Architecture: any
@@ -23,7 +24,7 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: libcairo1 (<< 0.5.0), libcairo0.5.1, libcairo0.6.0
+Replaces: libcairo0.5.1, libcairo0.6.0
 Description: The Cairo 2D vector graphics library
  Cairo is a multi-platform library providing anti-aliased
  vector-based rendering for multiple target backends. Paths consist
@@ -46,6 +47,7 @@
 Architecture: all
 Depends: lynx | www-browser
 Conflicts: libcairo0.5.1-doc, libcairo0.6.0-doc
+Replaces: libcairo0.5.1-doc, libcairo0.6.0-doc
 Description: Documentation for the Cairo Multi-platform 2D graphics library
  Cairo is a multi-platform library providing anti-aliased
  vector-based rendering for multiple target backends.