[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, 2.27.57/master, updated. "debian/2.27.57-2.27.57-2"

[Sylvain Le Gall]

The following commit has been merged in the 2.27.57/master branch:
commit 83f6e56500c9529df4b1b2166ecc76e53874dc1e
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Fri Feb 26 00:53:33 2010 +0100

    Move ${F:OtherUnison*} fields first due to a problem when merging conflicts in dpkg-gencontrol

diff --git a/debian/changelog b/debian/changelog
index b4a78b9..36fb0fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-unison2.27.57 (2.27.57-2) UNRELEASED; urgency=low
+unison2.27.57 (2.27.57-2) unstable; urgency=low
 
   * Synchronize with unison package
     * unison binaries are custom executables, so we can remove Depends on any
@@ -9,8 +9,10 @@ unison2.27.57 (2.27.57-2) UNRELEASED; urgency=low
       -silent is set
     * Auto generate conflicts with unisonX.Y.Z or unison (X.Y.Z) package
     * Enhance templating for unison and unison-gtk common files
+  * Move ${F:OtherUnison*} fields first due to a problem when merging
+    conflicts in dpkg-gencontrol
 
- -- Sylvain Le Gall <gildor at debian.org>  Thu, 25 Feb 2010 23:39:44 +0100
+ -- Sylvain Le Gall <gildor at debian.org>  Fri, 26 Feb 2010 00:52:11 +0100
 
 unison2.27.57 (2.27.57-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 340b06b..c6679e7 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Package: unison2.27.57
 Architecture: any
 Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends}
 Recommends: ssh-client | openssh-client
-Conflicts: unison (<< 2.9.1-3), ${F:OtherUnison}
+Conflicts: ${F:OtherUnison}, unison (<< 2.9.1-3)
 Description: A 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
@@ -45,7 +45,7 @@ Description: A file-synchronization tool for Unix and Windows
 Package: unison2.27.57-gtk
 Architecture: any
 Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends}
-Conflicts: unison-gtk (<< 2.9.1-3), ${F:OtherUnisonGtk}
+Conflicts: ${F:OtherUnisonGtk}, unison-gtk (<< 2.9.1-3)
 Recommends: ssh-askpass, ssh-client | openssh-client
 Description: A file-synchronization tool for Unix and Windows with GTK+ interface
  Unison is a file-synchronization tool for Unix and Windows, written

-- 
unison packaging