[Pkg-ocaml-maint-commits] r1740 - trunk/packages/unison/unison2.9.1/trunk/debian

[Sylvain LE GALL]

Author: gildor-guest
Date: 2005-09-05 20:56:33 +0000 (Mon, 05 Sep 2005)
New Revision: 1740

Modified:
   trunk/packages/unison/unison2.9.1/trunk/debian/changelog
   trunk/packages/unison/unison2.9.1/trunk/debian/control
   trunk/packages/unison/unison2.9.1/trunk/debian/rules
Log:
No more ssh dependency -- SLG


Modified: trunk/packages/unison/unison2.9.1/trunk/debian/changelog
===================================================================
--- trunk/packages/unison/unison2.9.1/trunk/debian/changelog	2005-09-05 20:09:43 UTC (rev 1739)
+++ trunk/packages/unison/unison2.9.1/trunk/debian/changelog	2005-09-05 20:56:33 UTC (rev 1740)
@@ -1,3 +1,10 @@
+unison2.9.1 (2.9.1-4) unstable; urgency=low
+
+  * Recommend ssh-client | openssh-client rather than ssh
+  * Remove dependency between unison and unison-gtk
+
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Mon,  5 Sep 2005 22:38:34 +0200
+
 unison2.9.1 (2.9.1-3) unstable; urgency=low
 
   * Merge changes from unison package:

Modified: trunk/packages/unison/unison2.9.1/trunk/debian/control
===================================================================
--- trunk/packages/unison/unison2.9.1/trunk/debian/control	2005-09-05 20:09:43 UTC (rev 1739)
+++ trunk/packages/unison/unison2.9.1/trunk/debian/control	2005-09-05 20:56:33 UTC (rev 1740)
@@ -8,7 +8,7 @@
 Package: unison2.9.1
 Architecture: any
 Depends: ${shlibs:Depends}, ${interpreter:Depends}
-Recommends: ssh
+Recommends: ssh-client | openssh-client
 Provides: unison
 Conflicts: unison (<< 2.9.1-3)
 Description: A file-synchronization tool for Unix and Windows
@@ -33,10 +33,10 @@
 
 Package: unison2.9.1-gtk
 Architecture: any
-Depends: unison2.9.1 (= ${Source-Version}), ${shlibs:Depends}, ${interpreter:Depends}
+Depends: ${shlibs:Depends}, ${interpreter:Depends}
 Provides: unison-gtk
 Conflicts: unison-gtk (<< 2.9.1-3)
-Recommends: ssh-askpass
+Recommends: ssh-askpass, ssh-client | openssh-client
 Description: A file-synchronization tool for Unix and Windows - GTK interface
  This package adds the optional GTK interface to the file synchronization
  tool 'unison'.

Modified: trunk/packages/unison/unison2.9.1/trunk/debian/rules
===================================================================
--- trunk/packages/unison/unison2.9.1/trunk/debian/rules	2005-09-05 20:09:43 UTC (rev 1739)
+++ trunk/packages/unison/unison2.9.1/trunk/debian/rules	2005-09-05 20:56:33 UTC (rev 1740)
@@ -3,18 +3,24 @@
 # In order to use dpatch 
 include /usr/share/dpatch/dpatch.make
 
-PACKAGE=unison
+PACKAGE=$(shell dpkg-parsechangelog | awk "/Source: .*/ { gsub(\"Source: \",\"\"); print }")
 
 # Variable that will be replaced in files
 
 VERSION=$(shell dpkg-parsechangelog | awk "/Version: .*/ { gsub(\"Version: \",\"\"); gsub(\"-.*\",\"\"); print; }")
 # Package version should be set to the version you want to be appended to 
 # the package name
-PACKAGE_VERSION=$(VERSION)
 
 # PRIORITY should be set to 10 for stable compatibility package 
 # and to 20 for unstable/testing package
+
+ifeq($(PACKAGE),"unison")
+PACKAGE_VERSION=
+PRIORITY=20
+else
+PACKAGE_VERSION=$(VERSION)
 PRIORITY=10
+endif
 
 UNISON=unison-$(VERSION)
 UNISON_MAJ=UNISON-$(VERSION)
@@ -29,6 +35,7 @@
 
 # set $(NATIVE) to true if this arch has an optimising compiler
 NATIVE := $(shell test -x /usr/bin/ocamlopt -o -x /usr/bin/ocamlopt.opt && echo true || echo false)
+UISTYLE := $(shell dpkg --compare-versions 2.10 ge $(VERSION) && echo gtk || echo gtk2)
 
 # which file to rename for following the version
 RENAME := debian/unison.1.in 
@@ -71,10 +78,14 @@
 	
 	# We always need to rename the manual 
 	mv debian/$(UNISON_PACKAGE).1 debian/$(UNISON).1
+	# We copy unison.1 to unison-gtk.1
+	cp debian/$(UNISON).1 debian/$(UNISON_GTK).1
 
-	$(MAKE) UISTYLE=gtk NATIVE=$(NATIVE) NAME=$(UNISON_GTK)
+	$(MAKE) UISTYLE=$(UISTYLE) NATIVE=$(NATIVE) 
+	mv unison $(UNISON_GTK)
 	
-	$(MAKE) UISTYLE=text NATIVE=$(NATIVE) NAME=$(UNISON)
+	$(MAKE) UISTYLE=text NATIVE=$(NATIVE) 
+	mv unison $(UNISON)
 
 	env HOME=$(CURDIR) $(CURDIR)/$(UNISON) -doc all > $(CURDIR)/unison-manual.txt
 
@@ -108,10 +119,6 @@
 	  $(CURDIR)/debian/$(UNISON_PACKAGE)/usr/bin
 	install -o root -g root -m 755 $(UNISON_GTK) \
 	  $(CURDIR)/debian/$(UNISON_GTK_PACKAGE)/usr/bin
-	ln -s $(UNISON_PACKAGE) \
-	  $(CURDIR)/debian/$(UNISON_GTK_PACKAGE)/usr/share/doc/$(UNISON_GTK_PACKAGE)
-	ln -s $(UNISON).1.gz \
-	  $(CURDIR)/debian/$(UNISON_GTK_PACKAGE)/usr/share/man/man1/$(UNISON_GTK).1.gz
 	# Creating symlink from binary to $(UNISON_ALTERNATIVE) and $(UNISON_GTK_ALTERNATIVE)
 	for i in \
 	  $(CURDIR)/debian/$(UNISON_PACKAGE)/usr/bin/$(UNISON_ALTERNATIVE) \
@@ -138,7 +145,7 @@
 	dh_installdocs 
 	mv debian/unison.doc-base-in debian/unison.doc-base.in
 	dh_installmenu
-	dh_installman debian/$(UNISON).1
+	dh_installman debian/$(UNISON).1 debian/$(UNISON_GTK).1
 	dh_installchangelogs NEWS
 	dh_compress
 	dh_fixperms