The following commit has been merged in the 2.32.52/master branch:
commit e9ba85d682f154a874a9c065cbeb1b2fc088a98a
Author: Stephane Glondu <st...@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 ca7b0a2..82d6930 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,8 @@ Package: unison2.32.52
 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.32.52-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

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to