[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.32.52-3-16-g9e209b8

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 9a1fe1612a3dcedce9d27e5e7d40d539eed3a6e1
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Jan 8 13:02:43 2012 +0100

    Replace Conflicts by Replaces/Breaks

diff --git a/debian/control b/debian/control
index 472e79f..c8c5fa3 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,8 @@ Package: unison
 Architecture: any
 Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends}
 Recommends: ssh-client | openssh-client
-Conflicts: ${F:OtherUnison}
+Replaces: ${F:OtherUnison}
+Breaks: ${F:OtherUnison}
 Description: file-synchronization tool for Unix and Windows
  Unison is a file-synchronization tool for Unix and Windows, written
  in OCaml. It allows two replicas of a collection of files and
@@ -44,7 +45,8 @@ Description: file-synchronization tool for Unix and Windows
 Package: unison-gtk
 Architecture: any
 Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends}
-Conflicts: ${F:OtherUnisonGtk}
+Replaces: ${F:OtherUnisonGtk}
+Breaks: ${F:OtherUnisonGtk}
 Recommends: ssh-askpass, ssh-client | openssh-client
 Description: file-synchronization tool for Unix and Windows with GTK+ interface
  Unison is a file-synchronization tool for Unix and Windows, written

-- 
unison packaging