[Pkg-ocaml-maint-commits] [dose3] 01/02: Merge branch 'master' into jessie-backports/master

[Ralf Treinen]

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

treinen pushed a commit to branch jessie-backports/master
in repository dose3.

commit 86e5088d1b14b889d9d00cbf8cd66f8dc70adda4
Merge: 7fe36ab 3bab9cd
Author: Ralf Treinen <treinen at irif.fr>
Date:   Mon Oct 17 16:45:25 2016 +0200

    Merge branch 'master' into jessie-backports/master
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 Makefile.config.in                                 |   4 +
 algo/dominators.ml                                 |   2 +-
 applications/distcheck.ml                          |   2 +-
 configure                                          |  18 +--
 configure.ac                                       |   2 +-
 deb/debcudf.ml                                     |  16 +--
 deb/tests.ml                                       |  69 ++++++-----
 debian/changelog                                   |  32 +++++
 debian/control                                     |   6 +-
 ...st_using-can-return-discording-result-bet.patch |  47 ++++++++
 ...ix-for-missing-essential-problem-apt-cudf.patch | 132 +++++++++++++++++++++
 ...s-distcheck.ml-Consider-essential-package.patch |  26 ++++
 ...tdUtils.ml-It-s-d.byte-and-not-p.byte-for.patch |  28 +++++
 ...ver.ml-reset-progress-bar-after-univcheck.patch |  34 ++++++
 ...ver.ml-set-correct-value-for-Util.Progres.patch |  35 ++++++
 ...s-deb-buildcheck.ml-fix-regression-that-l.patch |  54 +++++++++
 .../0008-Catch-expection-in-diagnostic.ml.patch    |  27 +++++
 debian/patches/distcheck-fg-bg                     |  18 ---
 debian/patches/getrealname                         |  31 -----
 debian/patches/input-xz-files                      |  54 +++++++++
 debian/patches/series                              |  13 +-
 21 files changed, 548 insertions(+), 102 deletions(-)

diff --cc debian/changelog
index accdf42,c87e091..16d17f6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,35 +1,41 @@@
+ dose3 (5.0.1-2) unstable; urgency=medium
+ 
+   [ Johannes Schauer ]
+   * Backport more commits from upstream to fix remaining bugs considering
+     - the handling of Essential:yes packages:
+         0003-applications-distcheck.ml-Consider-essential-package.patch
+         0007-applications-deb-buildcheck.ml-fix-regression-that-l.patch
+         0008-Catch-expection-in-diagnostic.ml.patch
+     - library bugs that affect packages using libdose3-dev:
+         0004-doseparse-stdUtils.ml-It-s-d.byte-and-not-p.byte-for.patch
+         0005-algo-depsolver.ml-reset-progress-bar-after-univcheck.patch
+         0006-algo-depsolver.ml-set-correct-value-for-Util.Progres.patch
+ 
+   [ Ralf Treinen ]
+   * Patch input-xz-files: accept input from xz-compressed files.
+     Add dependency on xz-utils.
+ 
+  -- Ralf Treinen <treinen at debian.org>  Sun, 16 Oct 2016 19:36:29 +0200
+ 
+ dose3 (5.0.1-1) unstable; urgency=medium
+ 
+   * new upstream release
+   * remove patches distcheck-fg-bg and getrealname as they have been
+     incorporated upstream
+   * backport patches
+     0001-check_request_using-can-return-discording-result-bet.patch and
+     0002-tentative-fix-for-missing-essential-problem-apt-cudf.patch from
+     upstream git to fix missing Essential:yes packages when invoking external
+     solvers
+ 
+  -- Johannes Schauer <josch at debian.org>  Thu, 08 Sep 2016 23:05:40 +0200
+ 
 +dose3 (5.0-3~bpo8+1) jessie-backports; urgency=medium
 +
 +  * backport to Debian Jessie
 +
 + -- Ralf Treinen <treinen at debian.org>  Thu, 21 Jul 2016 12:01:39 +0200
 +
  dose3 (5.0-3) unstable; urgency=medium
  
    * d/rules: make build-indep depend on configure-stamp
diff --cc debian/patches/series
index 415d483,ecef88b..4e242b0
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,10 +1,11 @@@
- binaries-prefix-edos
 +jessie-backports.patch
- distcheck-fg-bg
- getrealname
+ binaries-prefix-edos
+ 0001-check_request_using-can-return-discording-result-bet.patch
+ 0002-tentative-fix-for-missing-essential-problem-apt-cudf.patch
+ 0003-applications-distcheck.ml-Consider-essential-package.patch
+ 0004-doseparse-stdUtils.ml-It-s-d.byte-and-not-p.byte-for.patch
+ 0005-algo-depsolver.ml-reset-progress-bar-after-univcheck.patch
+ 0006-algo-depsolver.ml-set-correct-value-for-Util.Progres.patch
+ 0007-applications-deb-buildcheck.ml-fix-regression-that-l.patch
+ 0008-Catch-expection-in-diagnostic.ml.patch
+ input-xz-files

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