Bug#819341: Updated patch

[Benjamin Riefenstahl <Riefenstahl@mecom.de>]

Hi Stephane,

See attached a new patch, that adds only the native fsmonitor.

Thanks, benny

>From edac8a2918aed0eba453a2580d5f2e7f7c0f3ced Mon Sep 17 00:00:00 2001
From: Benjamin Riefenstahl <riefenstahl@mecom.de>
Date: Tue, 19 Feb 2019 11:10:38 +0100
Subject: [PATCH] Add package unison-fsmonitor.  (Closes: #819341)

This patch is based on work by John Lenton <jlenton@gmail.com> as
posted to the bug #819341.

Changes since then:

* Drop package unison-fsmonitor-python.

* Fix doc list for unison-fsmonitor.  Unison-fsmonitor should not
  contain another copy of the docs, so fix up DEB_INSTALL_DOCS
  accordingly.

* Make sure that unison-fsmontor is the same version as the base
  package.  The interface between unison and its helper is private and
  subject to change, so make sure that both use the same version.
---
 debian/control                  | 31 +++++++++++++++++++++++++++++--
 debian/rules                    |  4 +++-
 debian/unison-fsmonitor.install |  2 ++
 3 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 debian/unison-fsmonitor.install

diff --git a/debian/control b/debian/control
index 18a42b0..0f1f48e 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Homepage: http://www.cis.upenn.edu/~bcpierce/unison/
 Package: unison
 Architecture: any
 Depends: ${shlibs:Depends}, ${ocaml:Depends}, ${misc:Depends}
-Recommends: ssh-client | openssh-client
+Recommends: ssh-client | openssh-client, unison-fsmonitor
 Suggests: unison-all
 Replaces: ${F:OtherUnison}
 Breaks: ${F:OtherUnison}
@@ -49,7 +49,7 @@ Architecture: any
 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
 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,30 @@ Description: file-synchronization tool for Unix and Windows with GTK+ interface
  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 (= ${binary:Version}) | unison-gtk (= ${binary:Version})
+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 unison-fsmonitor helper program to
+ detect changes with "unison -repeat watch".
diff --git a/debian/rules b/debian/rules
index 7b76a24..40492c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,7 +80,9 @@ endif
 
 UISTYLE := $(shell dpkg --compare-versions 2.10 ge $(VERSION) && echo gtk || echo gtk2)
 
-DEB_INSTALL_DOCS_ALL := BUGS.txt TODO.txt unison-manual.txt -X unison.doc-base.in
+DEB_INSTALL_DOCS_DEFAULT = -X unison.doc-base.in
+DEB_INSTALL_DOCS_unison = BUGS.txt TODO.txt unison-manual.txt -X unison.doc-base.in
+DEB_INSTALL_DOCS_unison-gtk = $(DEB_INSTALL_DOCS_unison)
 
 DEB_INSTALL_CHANGELOGS_ALL := NEWS
 
diff --git a/debian/unison-fsmonitor.install b/debian/unison-fsmonitor.install
new file mode 100644
index 0000000..d1b769e
--- /dev/null
+++ b/debian/unison-fsmonitor.install
@@ -0,0 +1,2 @@
+unison-fsmonitor /usr/bin/
+
-- 
2.7.4

-- 
mecom Medien-Communikations-Gesellschaft mbH

Mittelweg 143, D 20148 Hamburg

Tel: +49 40 411332 801

Fax: +49 40 451962

http://www.mecom.de

Registergericht Hamburg, HRB 43177

Geschäftsführung: Barbara Bliefert, Norbert Schmidt-Banasch