[Pkg-ocaml-maint-commits] [findlib] 01/04: Imported Upstream version 1.4.1

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository findlib.

commit fab6433baa5e9237cd9e5b94d29a8256080c535e
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Mar 27 07:45:38 2014 +0100

    Imported Upstream version 1.4.1
---
 configure               |  4 ++--
 doc/README              |  3 +++
 doc/README.xml          |  6 ++++++
 src/findlib/frontend.ml | 10 +++++-----
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index cb1649b..496a12e 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: configure 200 2013-06-11 07:26:12Z gerd $
+# $Id: configure 204 2014-03-02 18:05:35Z gerd $
 # ----------------------------------------------------------------------
 #
 
@@ -7,7 +7,7 @@
 
 #set -x
 
-version="1.4"
+version="1.4.1"
 
 # Remember the old IFS value:
 oldifs="$IFS"
diff --git a/doc/README b/doc/README
index cf3e934..a5112e0 100644
--- a/doc/README
+++ b/doc/README
@@ -85,6 +85,9 @@ of questions.
 List of Changes
 ==============================================================================
 
+-  1.4.1:ocamldoc: The order of -ppopt arguments was changed by ocamlfind, 
+   which is not correct. (Sylvain Le Gall and J�r�mie Dimino.)
+   
 -  1.4: Fixed performance bug when many arguments need to be processed (J�r�me 
    Vouillon).
    Auto-configuring ocamldoc.opt if it is found (Christopher Zimmermann).
diff --git a/doc/README.xml b/doc/README.xml
index 229412b..9e16e36 100644
--- a/doc/README.xml
+++ b/doc/README.xml
@@ -110,6 +110,12 @@ configuration files, and library routines in detail.</p>
     <ul>
 
     <li>
+      <p><em>1.4.1:</em>ocamldoc: The order of -ppopt arguments was
+changed by ocamlfind, which is not correct. (Sylvain Le Gall and
+Jérémie Dimino.)</p>
+    </li>
+
+    <li>
       <p><em>1.4:</em> Fixed performance bug when many arguments
 need to be processed (Jérôme Vouillon).</p>
       <p>Auto-configuring ocamldoc.opt if it is found (Christopher
diff --git a/src/findlib/frontend.ml b/src/findlib/frontend.ml
index 58f5f3d..d077408 100644
--- a/src/findlib/frontend.ml
+++ b/src/findlib/frontend.ml
@@ -1,4 +1,4 @@
-(* $Id: frontend.ml 189 2013-01-14 17:10:28Z gerd $
+(* $Id: frontend.ml 203 2014-03-02 18:04:18Z gerd $
  * ----------------------------------------------------------------------
  *
  *)
@@ -1195,21 +1195,21 @@ let ocamldoc() =
     ( Arg.align
         [ "-package",
 	  Arg.String (fun s -> 
-		        packages := Fl_split.in_words s @ !packages),
+		        packages := !packages @ Fl_split.in_words s),
 	  "<name>  Add this package to the search path";
           
 	  "-predicates",
 	  Arg.String (fun s ->
-		        predicates := Fl_split.in_words s @ !predicates),
+		        predicates := !predicates @ Fl_split.in_words s),
 	  "<p>  Add predicate <p> when calculating dependencies";
 
 	  "-syntax",
 	  Arg.String (fun s ->
-		        syntax_preds := Fl_split.in_words s @ !syntax_preds),
+		        syntax_preds := !syntax_preds @ Fl_split.in_words s),
 	  "<p>  Use preprocessor with predicate <p>";
 
 	  "-ppopt",
-	  Arg.String (fun s -> pp_opts := s :: !pp_opts),
+	  Arg.String (fun s -> pp_opts := !pp_opts @ [s]),
 	  "<opt>  Append option <opt> to preprocessor invocation";
           
 	  "-thread",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/findlib.git