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

[Sylvain LE GALL]

Author: gildor-guest
Date: 2005-12-02 22:39:10 +0000 (Fri, 02 Dec 2005)
New Revision: 2222

Added:
   trunk/packages/unison/unison2.9.1/trunk/debian/control.in
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:
Prepare release -- SLG


Modified: trunk/packages/unison/unison2.9.1/trunk/debian/changelog
===================================================================
--- trunk/packages/unison/unison2.9.1/trunk/debian/changelog	2005-12-02 22:30:08 UTC (rev 2221)
+++ trunk/packages/unison/unison2.9.1/trunk/debian/changelog	2005-12-02 22:39:10 UTC (rev 2222)
@@ -1,3 +1,9 @@
+unison2.9.1 (2.9.1-5) unstable; urgency=low
+
+  * Remove hardcoded OCaml ABI
+
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Fri,  2 Dec 2005 23:38:26 +0100
+
 unison2.9.1 (2.9.1-4) unstable; urgency=low
 
   * Recommend ssh-client | openssh-client rather than ssh (Closes: #321115)

Modified: trunk/packages/unison/unison2.9.1/trunk/debian/control
===================================================================
--- trunk/packages/unison/unison2.9.1/trunk/debian/control	2005-12-02 22:30:08 UTC (rev 2221)
+++ trunk/packages/unison/unison2.9.1/trunk/debian/control	2005-12-02 22:39:10 UTC (rev 2222)
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox-3.08.3, liblablgtk-ocaml-dev, dpatch, chrpath
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09.0), liblablgtk-ocaml-dev, dpatch, chrpath
 Standards-Version: 3.6.2.0
 
 Package: unison2.9.1

Copied: trunk/packages/unison/unison2.9.1/trunk/debian/control.in (from rev 2188, trunk/packages/unison/unison2.9.1/trunk/debian/control)
===================================================================
--- trunk/packages/unison/unison2.9.1/trunk/debian/control	2005-11-29 22:29:10 UTC (rev 2188)
+++ trunk/packages/unison/unison2.9.1/trunk/debian/control.in	2005-12-02 22:39:10 UTC (rev 2222)
@@ -0,0 +1,42 @@
+Source: unison2.9.1
+Section: net
+Priority: optional
+Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= #OCamlABI#), liblablgtk-ocaml-dev, dpatch, chrpath
+Standards-Version: 3.6.2.0
+
+Package: unison2.9.1
+Architecture: any
+Depends: ${shlibs:Depends}, ${interpreter:Depends}
+Recommends: ssh-client | openssh-client
+Provides: unison
+Conflicts: 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
+ directories to be stored on different hosts (or different disks
+ on the same host), modified separately, and then brought up to
+ date by propagating the changes in each replica to the other.
+ .
+ Unison offers several advantages over various synchronization methods
+ such as CVS, Coda, rsync, Intellisync, etc. Unison can run on and
+ synchronize between Windows and many UNIX platforms. Unison requires
+ no root privileges, system access or kernel changes to function. Unison
+ can synchronize changes to files and directories in both directions,
+ on the same machine, or across a network using ssh or a direct
+ socket connection.
+ .
+ Transfers are optimised using a version of the rsync protocol, 
+ making it ideal for slower links. Unison has a clear and precise 
+ specification, and is resilient to failure due to its careful 
+ handling of the replicas and its private structures.
+
+Package: unison2.9.1-gtk
+Architecture: any
+Depends: ${shlibs:Depends}, ${interpreter:Depends}
+Provides: unison-gtk
+Conflicts: unison-gtk (<< 2.9.1-3)
+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-12-02 22:30:08 UTC (rev 2221)
+++ trunk/packages/unison/unison2.9.1/trunk/debian/rules	2005-12-02 22:39:10 UTC (rev 2222)
@@ -2,6 +2,7 @@
 
 # In order to use dpatch 
 include /usr/share/dpatch/dpatch.make
+OCAMLABI=$(shell ocamlc -version)
 
 PACKAGE=$(shell dpkg-parsechangelog | awk "/Source: .*/ { gsub(\"Source: \",\"\"); print }")
 
@@ -52,6 +53,9 @@
 RENAME += debian/unison-gtk.preinst.in
 RENAME += debian/unison-gtk.manpages.in
 
+debian/control: debian/control.in
+	sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
+
 build: build-stamp
 build-stamp: patch-stamp
 	dh_testdir
@@ -139,19 +143,19 @@
 binary-indep: build install
 
 binary-arch: build install
-	dh_testdir
-	dh_testroot
+	dh_testdir -a
+	dh_testroot -a
 	# Move temporarly the doc-base.in because dh_installdocs will take it into consideration
 	mv debian/unison.doc-base.in debian/unison.doc-base-in
-	dh_installdocs -A BUGS.txt TODO.txt unison-manual.txt
+	dh_installdocs -a -A BUGS.txt TODO.txt unison-manual.txt
 	mv debian/unison.doc-base-in debian/unison.doc-base.in
-	dh_installmenu
-	dh_installman 
-	dh_installchangelogs -A NEWS 
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
+	dh_installmenu -a
+	dh_installman -a
+	dh_installchangelogs -a -A NEWS 
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
 	if [ "x$(NATIVE)" = "xtrue" ]; then\
 	    for i in debian/*.substvars; do \
 	      echo "interpreter:Depends=" >> $$i;\
@@ -162,9 +166,9 @@
 	      echo "interpreter:Depends=ocaml-base-3.08.3" >> $$i;\
 	    done;\
 	fi
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_md5sums -a
+	dh_builddeb -a
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure