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

treinen pushed a commit to branch experimental/master
in repository dose3.

commit 251115f12c185637e10feaec86c6a426b6333874
Merge: 5c144ad 4542da7
Author: Ralf Treinen <trei...@free.fr>
Date:   Thu Dec 24 13:19:47 2015 +0100

    Merge branch 'master' into experimental/master

 CHANGES                                            |   37 +
 INSTALL                                            |    9 +-
 META.in                                            |   35 +-
 Makefile                                           |   93 +-
 Makefile.config.in                                 |   34 +-
 _tags.in                                           |   34 +-
 algo/defaultgraphs.ml                              |  372 ++++--
 algo/depsolver.ml                                  |  204 +--
 algo/depsolver.mli                                 |   26 +-
 algo/depsolver_int.ml                              |  285 +---
 algo/diagnostic.ml                                 |  512 ++++++--
 algo/diagnostic.mli                                |   86 +-
 algo/diagnostic_int.ml                             |    4 +-
 algo/dominators.ml                                 |    8 +-
 algo/flatten.ml                                    |    4 +-
 algo/statistics.ml                                 |    4 +-
 algo/strongconflicts.ml                            |    4 +-
 algo/strongconflicts_int.ml                        |    6 +-
 algo/strongdeps.ml                                 |   12 +-
 algo/strongdeps_int.ml                             |    8 +-
 algo/tests.ml                                      |   70 +-
 applications/apt-cudf.ml                           |    2 +-
 applications/ceve.ml                               |  151 ++-
 applications/challenged.ml                         |   89 +-
 applications/deb-buildcheck.ml                     |   63 +-
 applications/deb-coinstall.ml                      |   85 +-
 applications/distcheck.ml                          |  115 +-
 applications/dominators-graph.ml                   |   12 +-
 applications/dose-tests.list.in                    |  273 ++--
 applications/dose-tests.py                         |  162 ++-
 applications/outdated.ml                           |   25 +-
 applications/smallworld.ml                         |    8 +-
 applications/strong-deps.ml                        |   10 +-
 common/common.mlpack                               |    3 +
 common/cudfAdd.ml                                  |   86 +-
 common/cudfAdd.mli                                 |   68 +-
 common/cudfSolver.ml                               |  222 +++-
 common/edosSolver.ml                               |  229 +---
 common/edosSolver.mli                              |    3 -
 {deb => common}/format822.ml                       |   57 +-
 {deb => common}/format822_lexer.mll                |    0
 {deb => common}/format822_parser.mly               |    0
 common/input.ml                                    |   96 +-
 common/input.mli                                   |   13 +-
 common/shell_lexer.mll                             |   71 +
 common/tests.ml                                    |   36 +
 common/url.ml                                      |   21 +-
 common/url.mli                                     |    7 +-
 common/util.ml                                     |   13 +-
 common/util.mli                                    |    8 +-
 configure                                          | 1080 ++--------------
 configure.ac                                       |   38 +-
 cv/cv.mlpack                                       |    3 -
 cv/cvcudf.ml                                       |   78 --
 cv/packages.ml                                     |    0
 cv/version.ml                                      |    0
 deb/apt.ml                                         |   12 +-
 deb/architecture.ml                                |   80 +-
 deb/debcudf.ml                                     |   81 +-
 deb/debcudf.mli                                    |   11 +-
 deb/debian.mlpack                                  |    5 +-
 deb/debutil.ml                                     |   12 +-
 deb/edsp.ml                                        |   46 +-
 deb/evolution.ml                                   |   42 +-
 deb/packages.ml                                    |   37 +-
 deb/packages_lexer.mll                             |    1 +
 deb/packages_parser.mly                            |   31 +-
 deb/packages_types.ml                              |   22 +
 deb/printer.ml                                     |   13 +
 deb/release.ml                                     |    5 +
 deb/sources.ml                                     |  107 +-
 deb/tests.ml                                       |   45 +-
 debian/README.source                               |   28 +
 debian/apt-cudf.triggers                           |    2 +-
 debian/changelog                                   |  110 ++
 debian/compat                                      |    2 +-
 debian/control                                     |   18 +-
 debian/copyright                                   |   12 +-
 debian/dose-distcheck.NEWS                         |   37 +
 debian/patches/binaries-prefix-edos                |   80 +-
 debian/patches/coinstall-binary-name               |   10 +-
 debian/patches/encode-package-name-in-cudf_extras  |   35 -
 debian/patches/librpm-4.12                         |   35 +
 debian/patches/remove_src_prefix_from_name         |   21 -
 debian/patches/series                              |    4 +-
 debian/rules                                       |    8 +-
 doc/Makefile                                       |    6 +-
 doc/apt-cudf/apt-cudf.conf                         |    4 +-
 doc/apt-external-solvers.primer/.gitignore         |   12 +
 doc/apt-external-solvers.primer/advanced.tex       |  240 +++-
 .../apt-external-solvers.tex                       |    7 +-
 doc/apt-external-solvers.primer/basic.tex          |   63 +-
 doc/apt-external-solvers.primer/intro.tex          |    8 +
 doc/apt-external-solvers.primer/motivation.tex     |    9 +
 doc/manpages/buildcheck.pod                        |   12 +-
 doc/manpages/ceve.pod                              |   69 +-
 doc/manpages/distcheck.pod                         |    8 +-
 doc/webpages/Makefile                              |    8 -
 doc/webpages/README                                |  101 --
 doc/webpages/local.setup                           |  360 ------
 doc/webpages/src/biblio.mdwn                       |    0
 doc/webpages/src/contacts.mdwn                     |   17 -
 doc/webpages/src/css/purple.css                    | 1361 --------------------
 doc/webpages/src/documentation.mdwn                |    0
 doc/webpages/src/faq.mdwn                          |   22 -
 doc/webpages/src/index.mdwn                        |    5 -
 doc/webpages/src/install.mdwn                      |   80 --
 doc/webpages/src/quickstart.mdwn                   |  131 --
 doc/webpages/src/related.mdwn                      |   11 -
 doc/webpages/src/sidebar.mdwn                      |   15 -
 doc/webpages/src/tools.mdwn                        |   46 -
 doc/webpages/src/tutorial.mdwn                     |    0
 doc/webpages/src/tutorial/cudf.mdwn                |   86 --
 doc/webpages/templates/page.tmpl                   |   73 --
 dose3.odocl.in                                     |    6 +-
 doseparse/stdDebug.ml                              |    4 +-
 doseparse/stdLoaders.ml                            |  281 ++--
 doseparse/stdOptions.ml                            |  145 ++-
 doseparse/stdUtils.ml                              |    4 +-
 eclipse/eclipse.mlpack                             |    3 -
 eclipse/version.ml                                 |   48 -
 input-bug727642                                    |   57 -
 myocamlbuild.ml => myocamlbuild.ml.pp              |   13 +-
 opencsw/csw.mlpack                                 |    1 -
 opencsw/cswcudf.ml                                 |    1 +
 opencsw/packages.ml                                |   15 +-
 opencsw/version.ml                                 |   50 -
 {eclipse => pef}/packages.ml                       |   35 +-
 pef/packages_types.ml                              |   10 +
 pef/pef.itarget                                    |    4 +
 pef/pef.mlpack                                     |    3 +
 eclipse/eclipsecudf.ml => pef/pefcudf.ml           |   35 +-
 rpm/hdlists.ml                                     |    4 +-
 rpm/librpm4_stubs.c                                |    4 +-
 rpm/packages.ml                                    |   13 +-
 rpm/rpmcudf.ml                                     |    4 +-
 rpm/version.ml                                     |    5 +
 scripts/README                                     |   31 +
 scripts/distcheck-aggregate.py                     |   54 +
 scripts/distcheck-plot.py                          |  232 ++++
 scripts/distcheck-snapshot.sh                      |   37 +
 scripts/mirror-snapshot.sh                         |   23 +
 deb/version.ml => versioning/debian_version.ml     |   36 +-
 deb/version.mli => versioning/debian_version.mli   |   21 +-
 versioning/semantic_version.ml                     |   46 +
 versioning/versioning.itarget                      |    4 +
 versioning/versioning.ml                           |    3 +
 147 files changed, 4126 insertions(+), 5786 deletions(-)

diff --cc debian/copyright
index 3e9c0a3,290d421..69cab43
--- a/debian/copyright
+++ b/debian/copyright
@@@ -35,6 -35,10 +35,14 @@@ Files: debian/update-cudf-solver
  Copyright: © 2011 Stefano Zacchiroli
  License: LGPL-3+
  
+ Files: common/shell_lexer.mll
+ Copyright: © 2015 Johannes Schauer <j.scha...@email.de>
+ License: LGPL-3+
+ 
++Files: debian/update-cudf-solvers
++Copyright: © 2011 Stefano Zacchiroli
++License: LGPL-3+
++
  License: LGPL-3+
   This library is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as

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

_______________________________________________
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

Reply via email to