[libdap] 07/48: Change Conflicts, to Breaks, upload to unstable

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to tag unstable/3.12.0-1
in repository libdap.

commit 2b2c1df176b961ade7e8a13e471b3f267f66ce8a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Aug 26 05:59:06 2011 +0100

    Change Conflicts, to Breaks, upload to unstable
---
 debian/changelog | 7 +++++++
 debian/control   | 6 ++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4245b8f..b546f68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdap (3.11.1-3) experimental; urgency=low
+
+  * Uploato unstable; for libdapcient10, libdapserver7, change
+    Conflicts: to Breaks,add Replaces: libdap10
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Fri, 26 Aug 2011 05:58:06 +0100
+
 libdap (3.11.1-2) experimental; urgency=low
 
   * Incompatible library change libdap.so.10 becomes libdap.so.11.
diff --git a/debian/control b/debian/control
index 9d7df0c..a339076 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,8 @@ Description: Open-source Project for a Network Data Access Protocol library
 
 Package: libdapclient3
 Section: libs
-Conflicts: libdap10
+Replaces: libdap10
+Breaks: libdap10
 Architecture: any
 Depends:  libdap11 ( = ${binary:Version} ), ${misc:Depends}, ${shlibs:Depends}
 Description: Client library for the Network Data Access Protocol
@@ -47,7 +48,8 @@ Description: Client library for the Network Data Access Protocol
 
 Package: libdapserver7
 Section: libs
-Conflicts: libdap10
+Breaks: libdap10
+Replaces: libdap10
 Architecture: any
 Depends:  libdap11 ( = ${binary:Version} ), ${misc:Depends}, ${shlibs:Depends}
 Description: Server library for the Network Data Access Protocol

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libdap.git