Bug#819341: Diff to address this
I think the reporter is incorrect in that what the changelog means is
that the monitor is build *also* when NATIVE=false from 2.48.3. At
least on my system the monitor is built, and it has NATIVE=true. I
haven't tested whether it'll build on a system that doesn't have
ocamlopt.
This means there are two monitors in unison, a python-based one and a
ocaml one. They seem to be functionally equivalent and unison seems to
pick the ocaml one if they're both installed.
This patch creates two new packages, one with each of them. They're
not ideal, in that they'll ship the whole doc/ directory like the
other packages do (but the packaging is rather complex and I haven't
been able to make it not do that without ripping it apart), and they
ship the helpers in /usr/bin instead of libexecdir; shipping them
there would require patching unison, which seemed a little extreme.
(actually, an easy way of putting them in /usr/lib would be to ship
the versioned binary there with the alternative symlink in /usr/bin...
should I do that?)
--
John Lenton (jlenton@gmail.com) ::: http://chipaca.com
=== modified file 'debian/control'
--- debian/control 2015-08-18 14:57:24 +0000
+++ debian/control 2016-11-26 15:46:18 +0000
@@ -20,7 +20,7 @@
Package: unison
Architecture: any
Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends}
-Recommends: ssh-client | openssh-client
+Recommends: ssh-client | openssh-client, unison-fsmonitor | unison-fsmonitor-python
Suggests: unison-all
Replaces: ${F:OtherUnison}
Breaks: ${F:OtherUnison}
@@ -49,7 +49,7 @@
Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends}
Replaces: ${F:OtherUnisonGtk}
Breaks: ${F:OtherUnisonGtk}
-Recommends: ssh-askpass, ssh-client | openssh-client
+Recommends: ssh-askpass, ssh-client | openssh-client, unison-fsmonitor | unison-fsmonitor-python
Suggests: unison-all-gtk
Description: file-synchronization tool for Unix and Windows with GTK+ interface
Unison is a file-synchronization tool for Unix and Windows, written
@@ -72,3 +72,55 @@
handling of the replicas and its private structures.
.
This package adds the optional GTK+ interface.
+
+Package: unison-fsmonitor
+Architecture: any
+Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends}, unison | unison-gtk
+Description: file-synchronization tool for Unix and Windows with GTK+ interface
+ 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.
+ .
+ This package adds the optional native fsmonitor helper program to
+ detect changes via "unison -repeat watch".
+
+Package: unison-fsmonitor-python
+Architecture: all
+Depends: python-pyinotify, unison | unison-gtk
+Description: file-synchronization tool for Unix and Windows with GTK+ interface
+ 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.
+ .
+ This package adds the optional fsmonitor.py helper program to detect
+ changes via "unison -repeat watch".
=== added file 'debian/unison-fsmonitor-python.install'
--- debian/unison-fsmonitor-python.install 1970-01-01 00:00:00 +0000
+++ debian/unison-fsmonitor-python.install 2016-11-26 15:14:37 +0000
@@ -0,0 +1,2 @@
+fsmonitor.py /usr/bin/
+
=== added file 'debian/unison-fsmonitor.install'
--- debian/unison-fsmonitor.install 1970-01-01 00:00:00 +0000
+++ debian/unison-fsmonitor.install 2016-11-26 13:53:28 +0000
@@ -0,0 +1,2 @@
+unison-fsmonitor /usr/bin/
+
Reply to: