[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.27.57-4

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 6b4ed7630014e9aa0a2ca2b62be63be5b7b58125
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Tue Feb 23 01:11:17 2010 +0000

    Patch from unison trunk to remove 'Connected ...' message even when -silent is set (Closes: #497729)

diff --git a/debian/changelog b/debian/changelog
index d1f142a..42c83c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ unison (2.27.57-4) UNRELEASED; urgency=low
     ocaml-base* packages (Closes: #540481)
   * Add bash_completion (Closes: #349782, #481070)
   * Use the full path to access icon in .desktop (Closes: #541700)
+  * Patch from unison trunk to remove 'Connected ...' message even when
+    -silent is set (Closes: #497729)
 
  -- Sylvain Le Gall <gildor at debian.org>  Tue, 23 Feb 2010 00:42:07 +0000
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 599a45b..34128ed 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 debbug129478_strings_typo_ignore_regexp
 debbug137960_strings_obsolete_ssh_info
 debbug466173_strings_typo_follw
+debbug497729_silent
diff --git a/debian/patches/debbug497729_silent.dpatch b/debian/patches/debbug497729_silent.dpatch
new file mode 100755
index 0000000..d5a2a8d
--- /dev/null
+++ b/debian/patches/debbug497729_silent.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debbug497729_silent.dpatch by Sylvain Le Gall <gildor at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' unison~/uitext.ml unison/uitext.ml
+--- unison~/uitext.ml	2010-02-23 01:08:02.000000000 +0000
++++ unison/uitext.ml	2010-02-23 01:09:20.455127622 +0000
+@@ -616,7 +616,8 @@
+     Uicommon.uiInit
+       (fun s -> Util.msg "%s\n%s\n" Uicommon.shortUsageMsg s; exit 1)
+       (fun s -> Util.msg "%s" Uicommon.shortUsageMsg; exit 1)
+-      (fun () -> if not (Prefs.read silent)
++      (fun () -> if Prefs.read silent then Prefs.set Trace.terse true;
++                 if not (Prefs.read silent)
+                  then Util.msg "%s\n" (Uicommon.contactingServerMsg())) 
+       (fun () -> Some "default")
+       (fun () -> Util.msg "%s" Uicommon.shortUsageMsg; exit 1)

-- 
unison packaging