[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#819341: [unison] Please build unison-fsmonitor



Hi Damian,

Thank you for the proposed patch. I tried using it, and it appears that unison can't find the fsmonitor helper when it's named "unison-$(ABI)-fsmonitor". Instead it should be named "unison-fsmonitor-$(ABI)". See <https://github.com/bcpierce00/unison/blob/ce6f66b048724687d716df33d5b47a4a5634b936/src/fswatch.ml#L268>

I think you need something like the attached patch (disclaimer: works on my machine, that's as much testing as I did).

Have a nice day,
Fred.
From adfadd38804824df0c03443459068817799e9ed4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Perrin?= <fred@fperrin>
Date: Sun, 31 Aug 2025 11:34:00 +0100
Subject: [PATCH] Fix unison-fsmonitor name

---
 debian/rules             | 5 +++--
 debian/unison.install.in | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index a6f7844..e22046d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ SED_REPLACE := -e "s/@UNISON_PACKAGE@/unison-$(UNISON_ABI)/g"
 
 SED_REPLACE_TEXT := -e "s/@UNISON_MAJ@/UNISON-$(UNISON_ABI)/g"
 SED_REPLACE_TEXT += -e "s/@UNISON@/unison-$(UNISON_ABI)/g"
+SED_REPLACE_TEXT += -e "s/@UNISON_FSMONITOR@/unison-fsmonitor-$(UNISON_ABI)/g"
 
 SED_REPLACE_GTK := -e "s/@UNISON_MAJ@/UNISON-$(UNISON_ABI)-GTK/g"
 SED_REPLACE_GTK += -e "s/@UNISON@/unison-$(UNISON_ABI)-gtk/g"
@@ -63,8 +64,8 @@ override_dh_auto_install:
 # 	sed $(SED_REPLACE) $(SED_REPLACE_GTK) debian/unison-gtk.desktop.in > debian/tmp/usr/share/applications/unison-$(UNISON_ABI)-gtk.desktop
 # 	sed $(SED_REPLACE) $(SED_REPLACE_GTK) debian/unison-gtk.install.in > debian/unison-$(UNISON_ABI)-gtk.install
 # fsmonitor
-	cp src/unison-fsmonitor debian/tmp/usr/bin/unison-$(UNISON_ABI)-fsmonitor
-	sed $(SED_REPLACE) $(SED_REPLACE_TEXT) debian/unison-fsmonitor.1.in > debian/tmp/usr/share/man/man1/unison-$(UNISON_ABI)-fsmonitor.1
+	cp src/unison-fsmonitor debian/tmp/usr/bin/unison-fsmonitor-$(UNISON_ABI)
+	sed $(SED_REPLACE) $(SED_REPLACE_TEXT) debian/unison-fsmonitor.1.in > debian/tmp/usr/share/man/man1/unison-fsmonitor-$(UNISON_ABI).1
 
 override_dh_auto_test:
 
diff --git a/debian/unison.install.in b/debian/unison.install.in
index aca8e4a..b995535 100644
--- a/debian/unison.install.in
+++ b/debian/unison.install.in
@@ -1,5 +1,5 @@
 /usr/bin/@UNISON@
-/usr/bin/@UNISON@-fsmonitor
+/usr/bin/@UNISON_FSMONITOR@
 /usr/share/man/man1/@UNISON@.1
-/usr/share/man/man1/@UNISON@-fsmonitor.1
+/usr/share/man/man1/@UNISON_FSMONITOR@.1
 /usr/share/doc
-- 
2.47.2


Reply to: