This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to branch master
in repository dose3.
commit e21f2b722cc30529a03211752e19a1418f560938
Merge: 25446ba 87e422b
Author: Ralf Treinen <trei...@free.fr>
Date: Thu Jan 7 18:32:25 2016 +0100
Merge branch 'experimental/master'
INSTALL | 2 +-
META.in | 8 +-
Makefile | 54 +-
Makefile.config.in | 33 +-
TODO | 9 +-
_tags.in | 24 +-
algo/algo.mlpack.in | 5 +-
algo/defaultgraphs.ml | 125 +--
algo/depsolver.ml | 35 +-
algo/depsolver.mli | 7 +-
algo/depsolver_int.ml | 114 +-
algo/depsolver_int.mli | 136 +++
algo/diagnostic.ml | 265 ++++-
algo/diagnostic.mli | 27 +-
algo/dominators.ml | 2 +-
algo/strongconflicts.ml | 6 +-
algo/strongconflicts_int.ml | 6 +-
algo/strongdeps.ml | 128 ++-
algo/strongdeps_int.ml | 135 ---
algo/tests.ml | 4 +-
applications/apt-cudf.ml | 294 ++++--
applications/ceve.ml | 15 +-
applications/challenged.ml | 24 +-
applications/deb-buildcheck.ml | 29 +-
applications/deb-coinstall.ml | 10 +-
applications/distcheck.ml | 10 +-
applications/dominators-graph.ml | 3 +-
applications/dose-tests.py | 31 +-
applications/outdated.ml | 18 +-
applications/strong-deps.ml | 3 +-
common/.ocamldoc.txt | 1 +
common/common.mlpack | 4 +
common/criteria.ml | 136 +++
common/criteria_lexer.mll | 67 ++
common/criteria_parser.mly | 79 ++
common/criteria_types.ml | 13 +
common/cudfAdd.ml | 44 +-
common/cudfAdd.mli | 2 +-
common/cudfDiff.ml | 28 +-
common/cudfSolver.ml | 2 +-
common/format822.ml | 89 +-
common/format822_lexer.mll | 5 +-
common/format822_parser.mly | 17 +-
common/tests.ml | 11 +
common/url.ml | 16 +-
common/url.mli | 2 +-
common/util.ml | 39 +
common/util.mli | 18 +
configure | 1285 +++++++++++++++++++----
configure.ac | 33 +-
deb/.ocamldoc.txt | 1 +
deb/apt.ml | 33 +-
deb/debcudf.ml | 364 +++----
deb/debcudf.mli | 13 +-
deb/debian.mlpack | 4 -
deb/debutil.ml | 10 +-
deb/edsp.ml | 122 +--
deb/evolution.ml | 16 +-
deb/packages.ml | 351 +++----
deb/packages_types.ml | 22 -
deb/printer.ml | 168 ---
deb/release.ml | 22 +-
deb/sources.ml | 195 ++--
deb/tests.ml | 176 +++-
debian/changelog | 9 +
debian/control | 4 +-
debian/copyright | 4 +
debian/patches/binaries-prefix-edos | 34 +-
debian/patches/coinstall-binary-name | 15 -
debian/patches/cudfSolver-fix-leaking-fds | 21 +
debian/patches/series | 1 -
doc/manpages/apt-cudf.pod | 47 +
doc/manpages/buildcheck.pod | 159 ++-
doc/manpages/ceve.pod | 209 +++-
doc/manpages/distcheck.pod | 223 ++--
dose3.odocl.in | 37 +-
doseparse/.ocamldoc.txt | 1 +
doseparse/stdDebian.ml | 15 +-
doseparse/stdLoaders.ml | 56 +-
doseparse/stdOptions.ml | 127 ++-
myocamlbuild.ml.pp | 6 +-
opam/.ocamldoc.txt | 1 +
opam/opam.mlpack | 2 +
opam/opamcudf.ml | 168 +++
opam/packages.ml | 233 ++++
opam/packages.mli | 71 ++
pef/.ocamldoc.txt | 1 +
pef/packages.ml | 224 +++-
pef/packages.mli | 180 ++++
{deb => pef}/packages_lexer.mll | 8 +-
{deb => pef}/packages_parser.mly | 82 +-
pef/packages_types.ml | 13 +
pef/pef.mlpack | 5 +-
pef/pefcudf.ml | 119 ++-
pef/printer.ml | 127 +++
pef/printer.mli | 44 +
pef/tests.ml | 95 ++
scripts/doc.sh | 58 +
scripts/pack.ml | 304 ++++++
versioning/.ocamldoc.txt | 1 +
versioning/{debian_version.ml => debian.ml} | 0
versioning/{debian_version.mli => debian.mli} | 0
versioning/{semantic_version.ml => semver.ml} | 0
algo/diagnostic_int.ml => versioning/semver.mli | 22 +-
versioning/versioning.ml | 3 -
versioning/versioning.mlpack | 2 +
106 files changed, 5535 insertions(+), 2146 deletions(-)
diff --cc debian/changelog
index c9fa78c,3d0c1f4..4f3c910
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,12 +1,20 @@@
+ dose3 (4.1~beta1-1) experimental; urgency=medium
+
+ * new upstream version
+ - refreshed patch coinstall-binary-name
+ - dropped patch coinstall-binary-name, fixed upstream
+ * bump version of build-dependency ocamlgraph and ocaml-nox
+
+ -- Ralf Treinen <trei...@debian.org> Thu, 24 Dec 2015 14:52:09 +0100
+
+dose3 (4.0.2-4) unstable; urgency=medium
+
+ * Team upload.
+ * Disable call to dot during build to avoid FTBFS on some architectures
+ (Closes: #809049).
+
+ -- Mehdi Dogguy <me...@debian.org> Sun, 03 Jan 2016 11:17:07 +0100
+
dose3 (4.0.2-3) unstable; urgency=medium
* revert modifications done for 4.0.2-2 and restore generation of ocamldoc
diff --cc debian/patches/series
index d2fc358,96b0499..ca438a6
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,2 +1,3 @@@
binaries-prefix-edos
- coinstall-binary-name
# librpm-4.12
+disable_dot
--
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
