[Pkg-ocaml-maint-commits] [dose3] 02/08: Merge branch 'master' into experimental/master

[Ralf Treinen]

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

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

commit 81708d78426a7f7bb1049702855842fe4a4fcf28
Merge: 95d8ecf 3bc1447
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Feb 9 20:53:46 2016 +0100

    Merge branch 'master' into experimental/master

 CHANGES                                   |  33 +++++
 INSTALL                                   |  57 ++++++--
 Makefile                                  |  17 ++-
 Makefile.config.in                        |  45 ++++--
 algo/defaultgraphs.ml                     | 220 +++++++++++++++++++++---------
 algo/depsolver.ml                         | 126 +++++++++--------
 algo/depsolver.mli                        |   8 ++
 algo/strongconflicts.ml                   |   2 +-
 algo/strongdeps.ml                        |  36 +++--
 applications/apt-cudf.ml                  |  51 +++----
 applications/ceve.ml                      |  23 ++--
 common/criteria.ml                        |  20 +--
 common/criteria.mli                       |  26 ++++
 common/cudfDiff.ml                        |  95 ++++++-------
 common/cudfDiff.mli                       |  26 ++++
 common/cudfSolver.ml                      |  37 ++---
 common/format822.ml                       |   2 +-
 common/tests.ml                           |  35 +++++
 configure                                 |  21 ++-
 configure.ac                              |   5 +-
 debian/changelog                          |  57 +++++++-
 debian/control                            |   2 +-
 debian/dose-builddebcheck.NEWS            |  10 ++
 debian/dose-distcheck.NEWS                |  11 ++
 debian/patches/add-gnuhardened1-linux     |  17 +++
 debian/patches/cudf_max_int               |  31 +++++
 debian/patches/disable_dot                |  13 ++
 debian/patches/fix_META                   |  12 ++
 debian/patches/fix_ftbfs_on_bytecode_arch |  11 ++
 debian/patches/lexing-debian-fields       |  62 +++++++++
 debian/patches/series                     |   6 +
 debian/rules                              |   4 +-
 debian/tests/bug790422                    |  17 +++
 debian/tests/bug811569                    |  17 +++
 debian/tests/control                      |   2 +-
 debian/tests/repos/weird.fields.Packages  |  21 +++
 doseparse/doseparseNoRpm.mlpack           |   1 -
 doseparse/stdOptions.ml                   |   3 +-
 doseparseNoRpm                            |   1 -
 myocamlbuild.ml.pp                        |   2 +-
 opam/opamcudf.ml                          |  28 ++--
 opam/packages.ml                          |  66 +++++----
 opam/tests.ml                             | 154 +++++++++++++++++++++
 pef/packages.ml                           |   5 +-
 scripts/doc.sh                            |   7 +-
 45 files changed, 1091 insertions(+), 354 deletions(-)

diff --cc debian/changelog
index 1f1279a,049ad36..60a8336
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,42 +1,43 @@@
- dose3 (4.1~beta1-2) experimental; urgency=medium
+ dose3 (4.1-4) unstable; urgency=medium
  
-   * add patch fix-doc-target-without-ocamlopt.patch to make dose3 build on
-     architectures without ocamlopt
+   * patch lexing-debian-fields: syntax of debian fields according to
+     debian policy. Patch taken from upstream. (closes: #811569)
+   * patch add-gnuhardened1-linux: compile on hardenend1-linux-amd64. Thanks
+     to Balint Reczey for the patch! (closes: #812786)
+   * fix name of dose-deb-coinstall in package description of dose-extra
+     (closes: #812203)
+   * dose-{distcheck,builddebcheck}.NEWS: announce changes in printing of
+     package names (closes: #810303)
+   * add test cases for bug#811569 and bug#790422.
  
-  -- Johannes Schauer <josch at debian.org>  Sat, 26 Dec 2015 16:29:13 +0100
+  -- Ralf Treinen <treinen at debian.org>  Sun, 07 Feb 2016 18:36:16 +0100
+ 
+ dose3 (4.1-3) unstable; urgency=medium
+ 
+   * Fix META file: debian.cm{,x}a needs pef.cm{,x}a. The latter must
+     appear first in the META file.
+   * Add patch to correclty compute max_int on 32bits architectures
+     (Closes: #810513). Thanks to Julian Andres Klode for the patch.
+ 
+  -- Mehdi Dogguy <mehdi at debian.org>  Sat, 09 Jan 2016 20:01:04 +0100
+ 
+ dose3 (4.1-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Fix FTBFS on bytecode architectures.
+     - add patch fix_ftbfs_on_bytecode_arch
+ 
+  -- Mehdi Dogguy <mehdi at debian.org>  Thu, 07 Jan 2016 22:07:30 +0100
+ 
+ dose3 (4.1-1) unstable; urgency=medium
+ 
+   * new upstream version. This release implements versioned provides
+     (Closes: #786671).
+     - refreshed patch disable-dot.
+   * configure: explicit --bindir and --libdir
+ 
+  -- Ralf Treinen <treinen at debian.org>  Thu, 07 Jan 2016 18:49:53 +0100
++>>>>>>> master
  
  dose3 (4.1~beta1-1) experimental; urgency=medium
  
@@@ -14,6 -47,14 +48,21 @@@
  
   -- Ralf Treinen <treinen at 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 <mehdi at debian.org>  Sun, 03 Jan 2016 11:17:07 +0100
+ 
++dose3 (4.1~beta1-2) experimental; urgency=medium
++
++  * add patch fix-doc-target-without-ocamlopt.patch to make dose3 build on
++    architectures without ocamlopt
++
++ -- Johannes Schauer <josch at debian.org>  Sat, 26 Dec 2015 16:29:13 +0100
++
  dose3 (4.0.2-3) unstable; urgency=medium
  
    * revert modifications done for 4.0.2-2 and restore generation of ocamldoc

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