[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.32.52-1-7-gd23e600

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 3bfe1531b9050e3edd48391115a5707a3213ac48
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Feb 10 11:19:41 2011 +0100

    Remove conflicts older than oldstable, bump Standards-Version to 3.9.1

diff --git a/debian/control b/debian/control
index ecedc9c..df09e2d 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: cdbs (>= 0.4.23),
  librsvg2-bin (>= 2.18.2),
  imagemagick,
  dh-ocaml (>= 0.9.1)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/unison.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/unison.git
 Homepage: http://www.cis.upenn.edu/~bcpierce/unison/
@@ -21,7 +21,7 @@ Package: unison
 Architecture: any
 Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends}
 Recommends: ssh-client | openssh-client
-Conflicts: ${F:OtherUnison}, unison (<< 2.9.1-3)
+Conflicts: ${F:OtherUnison}
 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: unison-gtk
 Architecture: any
 Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends}
-Conflicts: ${F:OtherUnisonGtk}, unison-gtk (<< 2.9.1-3)
+Conflicts: ${F:OtherUnisonGtk}
 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