[Pkg-ocaml-maint-commits] r5547 - in /trunk/packages/unison/trunk/debian: changelog patches/00list patches/debbug129478_strings_typo_ignore_regexp.dpatch patches/debbug137960_strings_obsolete_ssh_info.dpatch patches/debbug466173_strings_typo_follw.dpatch
gildor at users.alioth.debian.org
gildor at users.alioth.debian.org
Thu Apr 24 22:46:49 UTC 2008
Author: gildor
Date: Thu Apr 24 22:46:49 2008
New Revision: 5547
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5547
Log:
* Add documentation patches from Lucas B. Cohen
Added:
trunk/packages/unison/trunk/debian/patches/debbug129478_strings_typo_ignore_regexp.dpatch
trunk/packages/unison/trunk/debian/patches/debbug137960_strings_obsolete_ssh_info.dpatch
trunk/packages/unison/trunk/debian/patches/debbug466173_strings_typo_follw.dpatch
Modified:
trunk/packages/unison/trunk/debian/changelog
trunk/packages/unison/trunk/debian/patches/00list
Modified: trunk/packages/unison/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/changelog?rev=5547&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/changelog (original)
+++ trunk/packages/unison/trunk/debian/changelog Thu Apr 24 22:46:49 2008
@@ -1,8 +1,9 @@
unison (2.27.57-2) UNRELEASED; urgency=low
- * NOT RELEASED YET
-
- -- Sylvain Le Gall <gildor at debian.org> Fri, 18 Apr 2008 12:20:14 +0200
+ * Correct typo in documentation, thanks to Lucas B. Cohen
+ (Closes: #137960, #129478, #466173)
+
+ -- Sylvain Le Gall <gildor at debian.org> Thu, 24 Apr 2008 23:13:56 +0200
unison (2.27.57-1) unstable; urgency=low
Modified: trunk/packages/unison/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/patches/00list?rev=5547&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/patches/00list (original)
+++ trunk/packages/unison/trunk/debian/patches/00list Thu Apr 24 22:46:49 2008
@@ -1,0 +1,3 @@
+debbug129478_strings_typo_ignore_regexp
+debbug137960_strings_obsolete_ssh_info
+debbug466173_strings_typo_follw
Added: trunk/packages/unison/trunk/debian/patches/debbug129478_strings_typo_ignore_regexp.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/patches/debbug129478_strings_typo_ignore_regexp.dpatch?rev=5547&op=file
==============================================================================
--- trunk/packages/unison/trunk/debian/patches/debbug129478_strings_typo_ignore_regexp.dpatch (added)
+++ trunk/packages/unison/trunk/debian/patches/debbug129478_strings_typo_ignore_regexp.dpatch Thu Apr 24 22:46:49 2008
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debbug129478_strings_typo_ignore_regexp.dpatch by Lucas B. Cohen <lucas.cohen at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad unison-2.27.57~/strings.ml unison-2.27.57/strings.ml
+--- unison-2.27.57~/strings.ml 2008-01-19 16:23:01.000000000 +0100
++++ unison-2.27.57/strings.ml 2008-04-23 02:01:31.000000000 +0200
+@@ -3722,7 +3722,7 @@
+ \032 changed. Instead of putting a line of the form\n\
+ \032 ignore = <regexp>\n\
+ \032 in your profile (.unison/default.prf), you should put:\n\
+- \032 ignore = Regexp <regexp>\n\
++ \032 ignore = Regex <regexp>\n\
+ \032 Moreover, two other styles of pattern are also recognized:\n\
+ \032 ignore = Name <name>\n\
+ \032 matches any path in which one component matches <name>, while\n\
Added: trunk/packages/unison/trunk/debian/patches/debbug137960_strings_obsolete_ssh_info.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/patches/debbug137960_strings_obsolete_ssh_info.dpatch?rev=5547&op=file
==============================================================================
--- trunk/packages/unison/trunk/debian/patches/debbug137960_strings_obsolete_ssh_info.dpatch (added)
+++ trunk/packages/unison/trunk/debian/patches/debbug137960_strings_obsolete_ssh_info.dpatch Thu Apr 24 22:46:49 2008
@@ -1,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debbug137960_strings_obsolete_ssh_info.dpatch by Lucas B. Cohen <lucas.cohen at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad unison-2.27.57~/strings.ml unison-2.27.57/strings.ml
+--- unison-2.27.57~/strings.ml 2008-01-19 16:23:01.000000000 +0100
++++ unison-2.27.57/strings.ml 2008-04-23 01:55:58.000000000 +0200
+@@ -492,10 +492,8 @@
+ \n\
+ \032 The standard remote shell facility on Unix systems is ssh, which\n\
+ \032 provides the same functionality as the older rsh but much better\n\
+- \032 security. Ssh is available from ftp://ftp.cs.hut.fi/pub/ssh/;\n\
+- \032 up-to-date binaries for some architectures can also be found at\n\
+- \032 ftp://ftp.faqs.org/ssh/contrib. See section [1]A.2 for installation\n\
+- \032 instructions for the Windows version.\n\
++ \032 security. Ssh is available from http://www.openssh.org/; See section [1]\n\
++ \032 A.2 for installation instructions for the Windows version.\n\
+ \n\
+ \032 Running ssh requires some coordination between the client and server\n\
+ \032 machines to establish that the client is allowed to invoke commands on\n\
+@@ -2425,9 +2423,8 @@
+ \032 and \"Add to Start Menu.\" You make the call.\n\
+ \032 d. You can now delete the directory Foo and its contents.\n\
+ \032 Some people have reported problems using Cygwin's ssh with Unison.\n\
+- \032 If you have trouble, you might try this one instead:\n\
+- \032 http://opensores.thebunker.net/pub/mirrors/ssh/contrib/ssh-1.2.14-win32bin.zi\n\
+- p\n\
++ \032 If you have trouble, you might try other ones instead:\n\
++ \032 http://linuxmafia.com/ssh/win32.html\n\
+ \032 2. You must set the environment variables HOME and PATH. Ssh will\n\
+ \032 create a directory .ssh in the directory given by HOME, so that it\n\
+ \032 has a place to keep data like your public and private keys. PATH\n\
Added: trunk/packages/unison/trunk/debian/patches/debbug466173_strings_typo_follw.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/patches/debbug466173_strings_typo_follw.dpatch?rev=5547&op=file
==============================================================================
--- trunk/packages/unison/trunk/debian/patches/debbug466173_strings_typo_follw.dpatch (added)
+++ trunk/packages/unison/trunk/debian/patches/debbug466173_strings_typo_follw.dpatch Thu Apr 24 22:46:49 2008
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debbug466173_strings_typo_follw.dpatch by Lucas B. Cohen <lucas.cohen at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad unison-2.27.57~/strings.ml unison-2.27.57/strings.ml
+--- unison-2.27.57~/strings.ml 2008-01-19 16:23:01.000000000 +0100
++++ unison-2.27.57/strings.ml 2008-04-23 01:22:17.000000000 +0200
+@@ -405,7 +405,7 @@
+ \n\
+ \032 indicates that the file c has been modified only in the second\n\
+ \032 replica, and that the default action is therefore to propagate the new\n\
+- \032 version to the first replica. To follw Unison's recommendation, press\n\
++ \032 version to the first replica. To follow Unison's recommendation, press\n\
+ \032 the \"f\" at the prompt.\n\
+ \n\
+ \032 If both replicas are modified and their contents are different, then\n\
More information about the Pkg-ocaml-maint-commits
mailing list