[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 90f388fd51a4eb65844824d52efa00c369176975
Merge: 2cf6d55 ef141da
Author: Ralf Treinen <treinen at pps.univ-paris-diderot.fr>
Date:   Thu Jul 21 12:00:42 2016 +0200

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

 debian/changelog               | 19 +++++++++++++++++++
 debian/dose-builddebcheck.NEWS |  8 ++++++++
 debian/dose-distcheck.NEWS     |  8 ++++++++
 debian/patches/distcheck-fg-bg | 18 ++++++++++++++++++
 debian/patches/getrealname     | 31 +++++++++++++++++++++++++++++++
 debian/patches/series          |  2 ++
 debian/rules                   |  2 +-
 7 files changed, 87 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index dd24f25,2c2f266..64d4e6e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,22 +1,29 @@@
+ dose3 (5.0-3) unstable; urgency=medium
+ 
+   * d/rules: make build-indep depend on configure-stamp
+ 
+  -- Ralf Treinen <treinen at debian.org>  Fri, 15 Jul 2016 22:55:36 +0200
+ 
+ dose3 (5.0-2) unstable; urgency=medium
+ 
+   * patch distcheck-fg-bg: fix calculation of the list of packages to check
+     by distcheck in case of both --bg and --fg arguments (closes: #830957).
+   * patch getrealname: fix the function get_real_name to remove both a
+     --virtual prefix and an :architecture suffix in case both are present.
+     This fixes a crash during the generation of explanations observed by
+     wanna-build.
+   * added NEWS item for dose-distcheck and dose-builddebcheck
+     about --latest now taking an integer argument.
+ 
+  -- Ralf Treinen <treinen at debian.org>  Fri, 15 Jul 2016 19:08:14 +0200
+ 
 +dose3 (5.0-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  [ Johannes Schauer ]
 +  * backport to Debian Jessie
 +
 + -- Ralf Treinen <treinen at debian.org>  Wed, 29 Jun 2016 14:44:27 +0200
 +
  dose3 (5.0-1) unstable; urgency=medium
  
    * new upstream release
diff --cc debian/patches/series
index 0191dd3,c0f50fb..415d483
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,3 +1,4 @@@
  binaries-prefix-edos
 +jessie-backports.patch
+ distcheck-fg-bg
+ getrealname

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