[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, 2.27.57/master, updated. debian/unison2.27.57-2.27.57-4-12-g8bd404c

[Stephane Glondu]

The following commit has been merged in the 2.27.57/master branch:
commit 4f48c45a5a77a5941324407158bb21b2342ab0bd
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 eb00081..c23043a 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,8 @@ Package: unison2.27.57
 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: unison2.27.57-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