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

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 0a99f80a839cba889f48e358305ff809900936f5
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Thu Feb 25 00:49:48 2010 +0100

    Auto generate conflicts with unisonX.Y.Z or unison (X.Y.Z)

diff --git a/debian/changelog b/debian/changelog
index 42c83c9..8c3b127 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,9 @@ unison (2.27.57-4) UNRELEASED; urgency=low
   * Add bash_completion (Closes: #349782, #481070)
   * Use the full path to access icon in .desktop (Closes: #541700)
   * Patch from unison trunk to remove 'Connected ...' message even when
-    -silent is set (Closes: #497729)
+    -silent is set (Closes: #497729, #551199)
+  * Auto generate conflicts with unisonX.Y.Z or unison (X.Y.Z) package
+    (Closes: #570910)
 
  -- Sylvain Le Gall <gildor at debian.org>  Tue, 23 Feb 2010 00:42:07 +0000
 
diff --git a/debian/control b/debian/control
index 736400c..25e3a87 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Package: unison
 Architecture: any
 Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends}
 Recommends: ssh-client | openssh-client
-Conflicts: unison (<< 2.9.1-3)
+Conflicts: unison (<< 2.9.1-3), ${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: unison-gtk (<< 2.9.1-3)
+Conflicts: unison-gtk (<< 2.9.1-3), ${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
diff --git a/debian/rules b/debian/rules
index 2c71127..26354f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,6 +73,16 @@ RENAME += debian/unison-gtk.links.in
 RENAME += debian/unison.links.in
 RENAME += debian/unison-gtk.desktop.in
 
+ifeq ($(DEB_SOURCE_PACKAGE),unison)
+OTHER_UNISON_PACKAGE=unison$(VERSION)
+OTHER_UNISON_GTK_PACKAGE=unison$(VERSION)-gtk
+else
+OTHER_UNISON_PACKAGE=unison (<< $(VERSION)-999)
+OTHER_UNISON_GTK_PACKAGE=unison-gtk (<< $(VERSION)-999)
+endif
+DEB_DH_GENCONTROL_ARGS += -- "-VF:OtherUnisonGtk=$(OTHER_UNISON_GTK_PACKAGE)" "-VF:OtherUnison=$(OTHER_UNISON_PACKAGE)"
+
+
 MY_MAKE_FLAGS += $(shell if test -x /usr/bin/ocamlopt.opt; then echo "OCAMLOPT=ocamlopt.opt"; fi )
 
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
@@ -184,11 +194,13 @@ unison-template-stamp: UNISON_SELF_VAR = $(UNISON_VAR)
 
 template: unison-template-stamp unison-gtk-template-stamp
 
+.PHONY: template
+
 #
 # Rename and substitute files
 #
 
-unison-rename: unison-rename-stamp
+unison-rename: template unison-rename-stamp 
 unison-rename-stamp:	
 	# Rename all the debhelper files needed and substitue the @XXX@
 	# string

-- 
unison packaging