The following commit has been merged in the master branch: commit 8ed98547d772598cd534dfef302e77cee6c0601b Author: Stephane Glondu <st...@glondu.net> Date: Sun Jan 8 13:57:09 2012 +0100
Remove all patches It looks like all the issues they fix have been addressed upstream. diff --git a/debian/patches/0001-Typo-in-ignore-Regex-help.patch b/debian/patches/0001-Typo-in-ignore-Regex-help.patch deleted file mode 100644 index 9b2dce8..0000000 --- a/debian/patches/0001-Typo-in-ignore-Regex-help.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Lucas B. Cohen <lucas.co...@free.fr> -Date: Thu, 10 Feb 2011 11:31:21 +0100 -Subject: Typo in ignore Regex help - -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=129478 ---- - strings.ml | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/strings.ml b/strings.ml -index 36861d9..1275399 100644 ---- a/strings.ml -+++ b/strings.ml -@@ -4011,7 +4011,7 @@ let docs = - \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\ --- diff --git a/debian/patches/0002-Fix-obsolete-help-about-ssh.patch b/debian/patches/0002-Fix-obsolete-help-about-ssh.patch deleted file mode 100644 index 146aedd..0000000 --- a/debian/patches/0002-Fix-obsolete-help-about-ssh.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Lucas B. Cohen <lucas.co...@free.fr> -Date: Thu, 10 Feb 2011 11:33:47 +0100 -Subject: Fix obsolete help about ssh - -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=137960 ---- - strings.ml | 11 ++++------- - 1 files changed, 4 insertions(+), 7 deletions(-) - -diff --git a/strings.ml b/strings.ml -index 1275399..b856170 100644 ---- a/strings.ml -+++ b/strings.ml -@@ -512,10 +512,8 @@ let docs = - \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\ -@@ -2545,9 +2543,8 @@ let docs = - \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\ --- diff --git a/debian/patches/0003-Typo-missing-o-in-follow.patch b/debian/patches/0003-Typo-missing-o-in-follow.patch deleted file mode 100644 index 093086d..0000000 --- a/debian/patches/0003-Typo-missing-o-in-follow.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Lucas B. Cohen <lucas.co...@free.fr> -Date: Thu, 10 Feb 2011 11:35:39 +0100 -Subject: Typo: missing o in follow - -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=466173 ---- - strings.ml | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/strings.ml b/strings.ml -index b856170..0976703 100644 ---- a/strings.ml -+++ b/strings.ml -@@ -425,7 +425,7 @@ let docs = - \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\ --- diff --git a/debian/patches/0004-Fix-silent-behaviour.patch b/debian/patches/0004-Fix-silent-behaviour.patch deleted file mode 100644 index c9ea757..0000000 --- a/debian/patches/0004-Fix-silent-behaviour.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Sylvain Le Gall <gil...@debian.org> -Date: Thu, 10 Feb 2011 11:37:46 +0100 -Subject: Fix -silent behaviour - -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=497729 ---- - uitext.ml | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/uitext.ml b/uitext.ml -index d00fd7e..cc6a839 100644 ---- a/uitext.ml -+++ b/uitext.ml -@@ -745,7 +745,8 @@ let start _ = - 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) --- diff --git a/debian/patches/0005-Fix-build-with-OCaml-3.12.patch b/debian/patches/0005-Fix-build-with-OCaml-3.12.patch deleted file mode 100644 index 3a87f3f..0000000 --- a/debian/patches/0005-Fix-build-with-OCaml-3.12.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: =?UTF-8?q?St=C3=A9phane=20Glondu?= <glo...@debian.org> -Date: Thu, 10 Feb 2011 11:38:49 +0100 -Subject: Fix build with OCaml 3.12 - -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585453 ---- - update.mli | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/update.mli b/update.mli -index dc1e018..c99c704 100644 ---- a/update.mli -+++ b/update.mli -@@ -1,7 +1,7 @@ - (* Unison file synchronizer: src/update.mli *) - (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *) - --module NameMap : Map.S with type key = Name.t -+module NameMap : MyMap.S with type key = Name.t - - type archive = - ArchiveDir of Props.t * archive NameMap.t --- diff --git a/debian/patches/0006-Fix-bad-interaction-with-OpenSSH-5.6.patch b/debian/patches/0006-Fix-bad-interaction-with-OpenSSH-5.6.patch deleted file mode 100644 index f274ed0..0000000 --- a/debian/patches/0006-Fix-bad-interaction-with-OpenSSH-5.6.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Stephane Glondu <st...@glondu.net> -Date: Sun, 3 Apr 2011 11:44:19 +0200 -Subject: [PATCH] Fix bad interaction with OpenSSH 5.6 - -Origin: https://bugs.archlinux.org/task/20877 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=620031 ---- - terminal.ml | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/terminal.ml b/terminal.ml -index 657f3d2..aafa425 100644 ---- a/terminal.ml -+++ b/terminal.ml -@@ -191,7 +191,6 @@ let create_session cmd args new_stdin new_stdout new_stderr = - exit 127 - end - | childPid -> -- Unix.close slaveFd; - (Some masterFd, childPid) - end - --- diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 9c2a4c0..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,6 +0,0 @@ -0001-Typo-in-ignore-Regex-help.patch -0002-Fix-obsolete-help-about-ssh.patch -0003-Typo-missing-o-in-follow.patch -0004-Fix-silent-behaviour.patch -0005-Fix-build-with-OCaml-3.12.patch -0006-Fix-bad-interaction-with-OpenSSH-5.6.patch -- unison packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits