[Pkg-ocaml-maint-commits] [opam] 04/04: Update patches
Mehdi Dogguy
mehdi at moszumanska.debian.org
Sat Nov 23 14:55:41 UTC 2013
This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository opam.
commit bda029b97b3778c1e08d4e31ba6cc9ac79adc3e7
Author: Mehdi Dogguy <mehdi at debian.org>
Date: Sat Nov 23 15:49:31 2013 +0100
Update patches
---
debian/changelog | 1 +
debian/patches/0001-Fix-some-spelling-errors.patch | 282 ++++-----------------
2 files changed, 46 insertions(+), 237 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4726d59..34c4f81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
opam (1.1.0-1) UNRELEASED; urgency=low
* New upstream release.
+ + Update patch (fix spelling errors).
-- Mehdi Dogguy <mehdi at debian.org> Sat, 23 Nov 2013 11:11:32 +0100
diff --git a/debian/patches/0001-Fix-some-spelling-errors.patch b/debian/patches/0001-Fix-some-spelling-errors.patch
index 3b31642..2acd193 100644
--- a/debian/patches/0001-Fix-some-spelling-errors.patch
+++ b/debian/patches/0001-Fix-some-spelling-errors.patch
@@ -1,246 +1,54 @@
From: Mehdi Dogguy <mehdi at debian.org>
-Date: Sun, 16 Jun 2013 14:15:33 +0200
+Date: Sat, 23 Nov 2013 15:52:08 +0100
Subject: Fix some spelling errors
---
- doc/dev-manual/dev-manual.tex | 2 +-
- doc/man/opam-init.1 | 2 +-
- doc/man/opam-install.1 | 2 +-
- doc/man/opam-reinstall.1 | 2 +-
- doc/man/opam-remove.1 | 4 ++--
- doc/man/opam-switch.1 | 6 +++---
- doc/man/opam-upgrade.1 | 2 +-
- src/client/opamMain.ml | 10 +++++-----
- src/client/opamState.ml | 2 +-
- src/client/opamState.mli | 2 +-
- src/core/opamFile.mli | 2 +-
- src/core/opamProcess.mli | 2 +-
- src/core/opamSystem.mli | 2 +-
- 13 files changed, 20 insertions(+), 20 deletions(-)
+ doc/dev-manual/dev-manual.tex | 4 ++--
+ src/solver/opamHeuristic.ml | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/dev-manual/dev-manual.tex b/doc/dev-manual/dev-manual.tex
-index fa34572..00ca19c 100644
+index fe0b5fa..6b7c4a5 100644
--- a/doc/dev-manual/dev-manual.tex
+++ b/doc/dev-manual/dev-manual.tex
-@@ -1039,7 +1039,7 @@ bytelink: [ "-g" ]
-
- \subsubsection{Switching Compiler Version}
-
--If the user wants to switch to an other compiler version, he should run:
-+If the user wants to switch to another compiler version, he should run:
-
- \begin{verbatim}
- $ opam switch [-clone] [-alias $ALIAS] $SWITCH
-diff --git a/doc/man/opam-init.1 b/doc/man/opam-init.1
-index 4360cb0..c46b8ca 100644
---- a/doc/man/opam-init.1
-+++ b/doc/man/opam-init.1
-@@ -61,7 +61,7 @@ Simply call the solver without actually performing any build/install operations.
- Display the external packages associated to the given tags.
- .TP 4
- \fB\-\-fake\fR
--WARNING: This option is fo testing purposes only! Using this option without care is the best way to corrupt your current compiler environement. When using this option OPAM will run a dry\-run of the solver and then fake the build and install commands
-+WARNING: This option is fo testing purposes only! Using this option without care is the best way to corrupt your current compiler environment. When using this option OPAM will run a dry\-run of the solver and then fake the build and install commands
- .TP 4
- \fB\-j\fR \fIJOBS\fR, \fB\-\-jobs\fR=\fIJOBS\fR (absent=1)
- Number of jobs to use when building packages.
-diff --git a/doc/man/opam-install.1 b/doc/man/opam-install.1
-index ef6bf66..0a21435 100644
---- a/doc/man/opam-install.1
-+++ b/doc/man/opam-install.1
-@@ -37,7 +37,7 @@ Simply call the solver without actually performing any build/install operations.
- Display the external packages associated to the given tags.
- .TP 4
- \fB\-\-fake\fR
--WARNING: This option is fo testing purposes only! Using this option without care is the best way to corrupt your current compiler environement. When using this option OPAM will run a dry\-run of the solver and then fake the build and install commands
-+WARNING: This option is fo testing purposes only! Using this option without care is the best way to corrupt your current compiler environment. When using this option OPAM will run a dry\-run of the solver and then fake the build and install commands
- .TP 4
- \fB\-m\fR \fIMAKE\fR, \fB\-\-make\fR=\fIMAKE\fR
- Use \fIMAKE\fR as the default 'make' command.
-diff --git a/doc/man/opam-reinstall.1 b/doc/man/opam-reinstall.1
-index f21d08c..a50e038 100644
---- a/doc/man/opam-reinstall.1
-+++ b/doc/man/opam-reinstall.1
-@@ -35,7 +35,7 @@ Simply call the solver without actually performing any build/install operations.
- Display the external packages associated to the given tags.
- .TP 4
- \fB\-\-fake\fR
--WARNING: This option is fo testing purposes only! Using this option without care is the best way to corrupt your current compiler environement. When using this option OPAM will run a dry\-run of the solver and then fake the build and install commands
-+WARNING: This option is fo testing purposes only! Using this option without care is the best way to corrupt your current compiler environment. When using this option OPAM will run a dry\-run of the solver and then fake the build and install commands
- .TP 4
- \fB\-m\fR \fIMAKE\fR, \fB\-\-make\fR=\fIMAKE\fR
- Use \fIMAKE\fR as the default 'make' command.
-diff --git a/doc/man/opam-remove.1 b/doc/man/opam-remove.1
-index ef28bcd..ff9c3bf 100644
---- a/doc/man/opam-remove.1
-+++ b/doc/man/opam-remove.1
-@@ -20,7 +20,7 @@ List of package names.
- .SH OPTIONS
- .TP 4
- \fB\-a\fR, \fB\-\-auto\-remove\fR
--Remove all the packages which have not been explicitely installed and which are not necessary anymore. It is possible to enforce keeping an already installed package by running \fBopam install <pkg>\fR. This flag can also be set using the \fB$OPAMAUTOREMOVE\fR configuration variable.
-+Remove all the packages which have not been explicitly installed and which are not necessary anymore. It is possible to enforce keeping an already installed package by running \fBopam install <pkg>\fR. This flag can also be set using the \fB$OPAMAUTOREMOVE\fR configuration variable.
- .TP 4
- \fB\-b\fR, \fB\-\-keep\-build\-dir\fR
- Keep the build directory. This is equivalent to setting \fB$OPAMKEEPBUILDIR\fR to a non\-empty string.
-@@ -38,7 +38,7 @@ Simply call the solver without actually performing any build/install operations.
- Display the external packages associated to the given tags.
- .TP 4
- \fB\-\-fake\fR
--WARNING: This option is fo testing purposes only! Using this option without care is the best way to corrupt your current compiler environement. When using this option OPAM will run a dry\-run of the solver and then fake the build and install commands
-+WARNING: This option is fo testing purposes only! Using this option without care is the best way to corrupt your current compiler environment. When using this option OPAM will run a dry\-run of the solver and then fake the build and install commands
- .TP 4
- \fB\-m\fR \fIMAKE\fR, \fB\-\-make\fR=\fIMAKE\fR
- Use \fIMAKE\fR as the default 'make' command.
-diff --git a/doc/man/opam-switch.1 b/doc/man/opam-switch.1
-index 5a44996..7e4a7c8 100644
---- a/doc/man/opam-switch.1
-+++ b/doc/man/opam-switch.1
-@@ -12,7 +12,7 @@ opam\-switch \- Manage multiple installation of compilers.
- \fBopam switch\fR [\fIOPTION\fR]... [\fICOMMAND\fR] [\fIARG\fR]...
- .SH DESCRIPTION
- .P
--This command allows to switch between different compiler versions, installing the compiler if \fBopam switch\fR is used to switch to that compiler for the first time. The different compiler versions are totally independant from each other, meaning that OPAM maintains a separate state (e.g. list of installed packages...) for each.
-+This command allows one to switch between different compiler versions, installing the compiler if \fBopam switch\fR is used to switch to that compiler for the first time. The different compiler versions are totally independant from each other, meaning that OPAM maintains a separate state (e.g. list of installed packages...) for each.
- .P
- See the documentation of \fBopam switch list\fR to see the compilers which are available, and how to switch or to install a new one.
- .SH ARGUMENTS
-@@ -43,7 +43,7 @@ Display the external packages associated to the given tags.
- The name of the file to export to/import from.
- .TP 4
- \fB\-\-fake\fR
--WARNING: This option is fo testing purposes only! Using this option without care is the best way to corrupt your current compiler environement. When using this option OPAM will run a dry\-run of the solver and then fake the build and install commands
-+WARNING: This option is fo testing purposes only! Using this option without care is the best way to corrupt your current compiler environment. When using this option OPAM will run a dry\-run of the solver and then fake the build and install commands
- .TP 4
- \fB\-i\fR, \fB\-\-installed\fR
- List installed packages only.
-@@ -134,4 +134,4 @@ Vincent Bernardoff <vb at luminar.eu.org>
- Guillem Rieu <guillem.rieu at ocamlpro.com>
- .SH BUGS
- .P
--Check bug reports at https://github.com/OCamlPro/opam/issues.
-\ No newline at end of file
-+Check bug reports at https://github.com/OCamlPro/opam/issues.
-diff --git a/doc/man/opam-upgrade.1 b/doc/man/opam-upgrade.1
-index 37c4668..c426b0a 100644
---- a/doc/man/opam-upgrade.1
-+++ b/doc/man/opam-upgrade.1
-@@ -35,7 +35,7 @@ Simply call the solver without actually performing any build/install operations.
- Display the external packages associated to the given tags.
- .TP 4
- \fB\-\-fake\fR
--WARNING: This option is fo testing purposes only! Using this option without care is the best way to corrupt your current compiler environement. When using this option OPAM will run a dry\-run of the solver and then fake the build and install commands
-+WARNING: This option is fo testing purposes only! Using this option without care is the best way to corrupt your current compiler environment. When using this option OPAM will run a dry\-run of the solver and then fake the build and install commands
- .TP 4
- \fB\-m\fR \fIMAKE\fR, \fB\-\-make\fR=\fIMAKE\fR
- Use \fIMAKE\fR as the default 'make' command.
-diff --git a/src/client/opamMain.ml b/src/client/opamMain.ml
-index 8805193..63ce527 100644
---- a/src/client/opamMain.ml
-+++ b/src/client/opamMain.ml
-@@ -319,7 +319,7 @@ let build_options =
- let fake =
- mk_flag ["fake"]
- "WARNING: This option is fo testing purposes only! Using this option without care is \
-- the best way to corrupt your current compiler environement. When using this option \
-+ the best way to corrupt your current compiler environment. When using this option \
- OPAM will run a dry-run of the solver and then fake the build and install commands" in
-
- Term.(pure create_build_options
-@@ -684,7 +684,7 @@ let remove =
- ] in
- let autoremove =
- mk_flag ["a";"auto-remove"]
-- "Remove all the packages which have not been explicitely installed and \
-+ "Remove all the packages which have not been explicitly installed and \
- which are not necessary anymore. It is possible to enforce keeping an \
- already installed package by running $(b,opam install <pkg>). This flag \
- can also be set using the $(b,\\$OPAMAUTOREMOVE) configuration variable." in
-@@ -893,7 +893,7 @@ let switch =
- description. To switch to an already installed compiler alias (with \
- state = I), use $(b,opam switch <name>). If you want to use a new \
- compiler <comp>, use $(b,opam switch <comp>): this will download, \
-- compile and create a fresh and independant environment where new packages can be installed. \
-+ compile and create a fresh and independent environment where new packages can be installed. \
- If you want to create a new compiler alias (for instance because you already have \
- this compiler version installed), use $(b,opam switch <name> --alias-of <comp>). In case \
- <name> and <comp> are the same, this is equivalent to $(b,opam switch <comp>).";
-@@ -901,10 +901,10 @@ let switch =
- ] in
- let man = [
- `S "DESCRIPTION";
-- `P "This command allows to switch between different compiler versions, \
-+ `P "This command allows one to switch between different compiler versions, \
- installing the compiler if $(b,opam switch) is used to switch to that \
- compiler for the first time. The different compiler versions are \
-- totally independant from each other, meaning that OPAM maintains a \
-+ totally independent from each other, meaning that OPAM maintains a \
- separate state (e.g. list of installed packages...) for each.";
- `P "See the documentation of $(b,opam switch list) to see the compilers which \
- are available, and how to switch or to install a new one."
-diff --git a/src/client/opamState.ml b/src/client/opamState.ml
-index aa696a5..cf44903 100644
---- a/src/client/opamState.ml
-+++ b/src/client/opamState.ml
-@@ -1087,7 +1087,7 @@ let update_dot_profile t dot_profile shell =
- | `no -> OpamGlobals.msg " %s is already up-to-date.\n" pretty_dot_profile
- | `otherroot ->
- OpamGlobals.msg
-- " %s is already configured for an other OPAM root.\n"
-+ " %s is already configured for another OPAM root.\n"
- pretty_dot_profile
- | `yes ->
- let init_file = init_file shell in
-diff --git a/src/client/opamState.mli b/src/client/opamState.mli
-index c864294..d6628ab 100644
---- a/src/client/opamState.mli
-+++ b/src/client/opamState.mli
-@@ -61,7 +61,7 @@ type state = {
- (** The list of installed packages *)
- installed: OpamFile.Installed.t;
-
-- (** The list of packages explicitely installed by the user *)
-+ (** The list of packages explicitly installed by the user *)
- installed_roots: OpamFile.Installed_roots.t;
-
- (** The list of packages which needs to be reinsalled *)
-diff --git a/src/core/opamFile.mli b/src/core/opamFile.mli
-index 7d7cef1..56c18f4 100644
---- a/src/core/opamFile.mli
-+++ b/src/core/opamFile.mli
-@@ -208,7 +208,7 @@ module Export: IO_FILE with type t = package_set * package_set
- (** List of installed packages: [$opam/$oversion/installed] *)
- module Installed: IO_FILE with type t = package_set
-
--(** List of packages explicitely installed by the user:
-+(** List of packages explicitly installed by the user:
- [$opam/$switch/installed.user] *)
- module Installed_roots: IO_FILE with type t = package_set
-
-diff --git a/src/core/opamProcess.mli b/src/core/opamProcess.mli
-index 8b712e6..2c28b43 100644
---- a/src/core/opamProcess.mli
-+++ b/src/core/opamProcess.mli
-@@ -24,7 +24,7 @@ type t = {
- p_time : float; (** Process start time *)
- p_stdout : string option; (** stdout dump file *)
- p_stderr : string option; (** stderr dump file *)
-- p_env : string option; (** dump environement variables *)
-+ p_env : string option; (** dump environment variables *)
- p_info : string option; (** dump process info *)
- }
-
-diff --git a/src/core/opamSystem.mli b/src/core/opamSystem.mli
-index baead7a..a4b44f2 100644
---- a/src/core/opamSystem.mli
-+++ b/src/core/opamSystem.mli
-@@ -99,7 +99,7 @@ val directories_with_links: string -> string list
- (** a command is a list of words *)
- type command = string list
-
--(** Test wether a command exists in the environement. *)
-+(** Test wether a command exists in the environment. *)
- val command_exists: ?env:string array -> string -> bool
-
- (** [command cmd] executes the command [cmd] in the correct OPAM
+@@ -388,7 +388,7 @@ The {\tt depopts} field contains a {\em OR} formula over
+ some functionality will not be available as some optional
+ dependencies are not installed.
+
+-\item The {\tt post-messages} field (since version $1.1.0$) allows to print
++\item The {\tt post-messages} field (since version $1.1.0$) allows one to print
+ specific messages to the user after the end of installation. The special
+ boolean variable \verb+failure+ is defined in the scope of the filter, and can
+ be used to print messages in case there was an error (typically, a hint on how
+@@ -755,7 +755,7 @@ Switch-related meta-data are stored under \verb+$opam/$SWITCH/+:
+ \item \verb+$opam/$SWITCH/installed.root+ is the list of installed
+ packages roots for the compiler instance \verb+$SWITCH+.
+ The file format is described in \S\ref{file:installed}. A package
+- root has been explicitely installed by the user.
++ root has been explicitly installed by the user.
+
+ \item \verb+$opam/$SWITCH/config/$NAME.config+ is a
+ platform-specific configuration file of for the installed package
+diff --git a/src/solver/opamHeuristic.ml b/src/solver/opamHeuristic.ml
+index 9411b43..1a6c903 100644
+--- a/src/solver/opamHeuristic.ml
++++ b/src/solver/opamHeuristic.ml
+@@ -452,7 +452,7 @@ let optimize ?(verbose=true) universe request =
+ let request = refine state request in
+
+ (* strategy where we try keep the installed version before trying
+- an other one. *)
++ another one. *)
+ let installed_first state p =
+ log "installed-first %s" p.Cudf.package;
+ if consistent_packages universe (p :: state) then (
+@@ -466,7 +466,7 @@ let optimize ?(verbose=true) universe request =
+ state
+ | Some state ->
+ let p = List.find (fun i -> i.Cudf.package = p.Cudf.package) state in
+- log "pick an other version of %s (%d)" p.Cudf.package p.Cudf.version;
++ log "pick another version of %s (%d)" p.Cudf.package p.Cudf.version;
+ log "request: %s" (OpamCudf.string_of_request request);
+ log "state: %s" (OpamCudf.string_of_packages state);
+ state
--
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/opam.git
More information about the Pkg-ocaml-maint-commits
mailing list