[Pkg-ocaml-maint-commits] [ocamlbuild] 02/06: Merge tag 'upstream/0.10.1'

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository ocamlbuild.

commit a94919c66f1710997f588a3ca96d263ec6f026fe
Merge: 2f9296e 6c5972f
Author: Ximin Luo <infinity0 at pdeb2>
Date:   Fri Mar 3 20:11:36 2017 +0100

    Merge tag 'upstream/0.10.1'
    
    Upstream version 0.10.1
    
    # gpg: Signature made Fri 03 Mar 2017 20:11:36 CET
    # gpg:                using RSA key 3667486A326DB2766D255546860DEF3B8F650B79
    # gpg: Good signature from "Ximin Luo <infinity0 at pwned.gg>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at torproject.org>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at freenetproject.org>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at debian.org>" [ultimate]
    # gpg:                 aka "Satoshi Nakamoto (www.bitcoin.org) <satoshin at gmx.com>" [ultimate]

 .gitignore                                         |   4 +
 Changes                                            |  76 +++++-
 META                                               |   2 +-
 Makefile                                           |  69 +++++-
 VERSION                                            |   2 +-
 configure.make                                     |  16 +-
 {manual/examples => examples}/01-simple/Makefile   |   0
 {manual/examples => examples}/01-simple/main.ml    |   0
 {manual/examples => examples}/01-simple/util.ml    |   0
 {manual/examples => examples}/01-simple/util.mli   |   0
 {manual/examples => examples}/02-subdirs/Makefile  |   0
 .../examples => examples}/02-subdirs/lib/util.ml   |   0
 .../examples => examples}/02-subdirs/lib/util.mli  |   0
 .../examples => examples}/02-subdirs/src/main.ml   |   0
 {manual/examples => examples}/03-packages/Makefile |   0
 {manual/examples => examples}/03-packages/_tags    |   0
 .../examples => examples}/03-packages/lib/util.ml  |   0
 .../examples => examples}/03-packages/lib/util.mli |   0
 .../examples => examples}/03-packages/src/main.ml  |   0
 {manual/examples => examples}/04-library/Makefile  |   0
 {manual/examples => examples}/04-library/_tags     |   0
 .../04-library/libdemo/hello.ml                    |   0
 .../04-library/libdemo/hello.mli                   |   0
 .../04-library/libdemo/libdemo.mllib               |   0
 .../04-library/libdemo/util.ml                     |   0
 .../04-library/libdemo/util.mli                    |   0
 .../examples => examples}/04-library/src/main.ml   |   0
 {manual/examples => examples}/05-lex-yacc/Makefile |   0
 {manual/examples => examples}/05-lex-yacc/_tags    |   0
 .../examples => examples}/05-lex-yacc/lib/hello.ml |   0
 .../05-lex-yacc/lib/hello.mli                      |   0
 .../examples => examples}/05-lex-yacc/lib/util.ml  |   0
 .../examples => examples}/05-lex-yacc/lib/util.mli |   0
 .../05-lex-yacc/src/lexer.mli                      |   0
 .../05-lex-yacc/src/lexer.mll                      |   0
 .../examples => examples}/05-lex-yacc/src/main.ml  |   0
 .../05-lex-yacc/src/parser.mly                     |   0
 {manual/examples => examples}/06-ocamldoc/Makefile |   0
 .../06-ocamldoc/doc/api.odocl                      |   0
 .../examples => examples}/06-ocamldoc/lib/hello.ml |   0
 .../06-ocamldoc/lib/hello.mli                      |   0
 .../examples => examples}/06-ocamldoc/lib/util.ml  |   0
 .../examples => examples}/06-ocamldoc/lib/util.mli |   0
 .../examples => examples}/06-ocamldoc/src/main.ml  |   0
 {manual/examples => examples}/Makefile             |   0
 examples/example1/hello.ml                         |  18 --
 examples/example2/greet.ml                         |  19 --
 examples/example2/hello.ml                         |  27 ---
 examples/example3/epoch.ml                         |  19 --
 examples/example3/make.sh                          |  44 ----
 howto/release.adoc                                 |   5 +-
 man/ocamlbuild.1                                   | 268 ---------------------
 man/ocamlbuild.footer.1                            |   8 +
 man/ocamlbuild.header.1                            | 102 ++++++++
 man/options_man.ml                                 |  42 ++++
 manual/manual.adoc                                 |  47 ++--
 opam                                               |   1 +
 .../Ocaml_tools.ml                                 |   0
 .../myocamlbuild.ml                                |   0
 src/command.ml                                     |   2 +-
 src/display.ml                                     |   4 +-
 src/loc.ml                                         |   2 +-
 src/main.ml                                        |  25 +-
 src/my_std.ml                                      |   2 +-
 src/ocaml_specific.ml                              | 114 ++++-----
 src/ocaml_utils.ml                                 |   8 +-
 src/options.ml                                     |  22 +-
 src/options.mli                                    |   2 +
 src/plugin.ml                                      |  90 ++++---
 src/signatures.mli                                 |   2 +-
 src/tools.ml                                       |   2 +-
 testsuite/README                                   |   7 +-
 testsuite/internal.ml                              |  75 ++++++
 73 files changed, 573 insertions(+), 553 deletions(-)

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