[Pkg-ocaml-maint-commits] [opam] 05/12: Refresh patch 0001-Fix-some-spelling-errors.patch

[Mehdi Dogguy]

This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository opam.

commit a2b695a5ec6619ab519a45638e09309eeadc27b9
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Oct 22 22:55:24 2014 +0200

    Refresh patch 0001-Fix-some-spelling-errors.patch
---
 debian/patches/0001-Fix-some-spelling-errors.patch | 35 +++++++++++++++-------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/debian/patches/0001-Fix-some-spelling-errors.patch b/debian/patches/0001-Fix-some-spelling-errors.patch
index 2acd193..693ca07 100644
--- a/debian/patches/0001-Fix-some-spelling-errors.patch
+++ b/debian/patches/0001-Fix-some-spelling-errors.patch
@@ -1,17 +1,18 @@
 From: Mehdi Dogguy <mehdi at debian.org>
-Date: Sat, 23 Nov 2013 15:52:08 +0100
+Date: Wed, 22 Oct 2014 22:49:47 +0200
 Subject: Fix some spelling errors
 
 ---
  doc/dev-manual/dev-manual.tex |    4 ++--
+ src/client/opamClient.ml      |    2 +-
  src/solver/opamHeuristic.ml   |    4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ 3 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/doc/dev-manual/dev-manual.tex b/doc/dev-manual/dev-manual.tex
-index fe0b5fa..6b7c4a5 100644
+index dd8c4fa..d4f930c 100644
 --- a/doc/dev-manual/dev-manual.tex
 +++ b/doc/dev-manual/dev-manual.tex
-@@ -388,7 +388,7 @@ The {\tt depopts} field contains a {\em OR} formula over
+@@ -425,7 +425,7 @@ The field {\tt cores} is the number of parallel process that
    some functionality will not be available as some optional
    dependencies are not installed.
  
@@ -20,7 +21,7 @@ index fe0b5fa..6b7c4a5 100644
    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/+:
+@@ -796,7 +796,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
@@ -29,11 +30,24 @@ index fe0b5fa..6b7c4a5 100644
  
  \item \verb+$opam/$SWITCH/config/$NAME.config+ is a
    platform-specific configuration file of for the installed package
+diff --git a/src/client/opamClient.ml b/src/client/opamClient.ml
+index 38e8478..91a0a3b 100644
+--- a/src/client/opamClient.ml
++++ b/src/client/opamClient.ml
+@@ -855,7 +855,7 @@ module API = struct
+            if not (OpamPackage.Set.is_empty unopt) then
+              OpamGlobals.msg
+                "The following would require downgrades or uninstalls, but \
+-                you may upgrade them explicitely:\n  - %s\n"
++                you may upgrade them explicitly:\n  - %s\n"
+                (String.concat "\n  - "
+                   (List.map OpamPackage.to_string
+                      (OpamPackage.Set.elements unopt)));
 diff --git a/src/solver/opamHeuristic.ml b/src/solver/opamHeuristic.ml
-index 9411b43..1a6c903 100644
+index de7a487..6148413 100644
 --- a/src/solver/opamHeuristic.ml
 +++ b/src/solver/opamHeuristic.ml
-@@ -452,7 +452,7 @@ let optimize ?(verbose=true) universe request =
+@@ -507,7 +507,7 @@ let optimize ?(verbose=true) ~version_map map_init_u universe request =
      let request = refine state request in
  
      (* strategy where we try keep the installed version before trying
@@ -42,13 +56,12 @@ index 9411b43..1a6c903 100644
      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 =
+@@ -522,7 +522,7 @@ let optimize ?(verbose=true) ~version_map map_init_u 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);
+           log "request: %a" (slog OpamCudf.string_of_request) request;
+           log "state: %a" (slog 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