[libreoffice] 03/03: Merge remote-tracking branch 'origin/debian-experimental-5.1' into debian-experimental-5.2

[Rene Engelhard <rene@moszumanska.debian.org>]

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

rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.

commit 09cea43b5092a1b13252cd4831bda4b5cbfd7fb9
Merge: f0c6e73 cf4eaf8
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Dec 23 11:04:30 2015 +0100

    Merge remote-tracking branch 'origin/debian-experimental-5.1' into debian-experimental-5.2
    
    Conflicts:
    	changelog
    	patches/series

 changelog                     |  18 ++++++++
 control                       |  67 ++-------------------------
 control.debug.in              |   6 +--
 rules                         | 102 +++++++++++++++++++++++++++++-------------
 tests/control                 |   2 +-
 tests/{control => control.in} |   2 +-
 tests/junit-subsequentcheck   |   3 +-
 7 files changed, 99 insertions(+), 101 deletions(-)

diff --cc changelog
index 50863d3,18e9473..04078d1
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,21 +1,27 @@@
 +libreoffice (1:5.2.0~alpha1~git20151221-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene@rene-engelhard.de>  Thu, 26 Nov 2015 10:37:57 +0100
 +
+ libreoffice (1:5.1.0~rc2~git20151222-1) UNRELEASED; urgency=medium
+ 
+   * New upstream snapshot
+ 
+   * debian/rules:
+     - fix/update some ddeb conditionals and migrate -dbg to -dbgsym 
+     - "supplement" the -dbgsym packages also with the gdb helpers and
+       the appropriate recommends (gdb, python3-six)
+   * debian/tests/control{,in}, debian/rules: generate autopkgtest control
+     with proper depends (-dbg or *-dbgsym) in rules' control target
+   * debian/tests/junit-subsequentcheck.diff: run
+     ./debian/rules config_host.mk enable_report_builder=no to disable the SRB
+     of which we don't have the (build-)deps in -subsequentcheckbases deps.
+   * debian/control.debug.in: recommend gdb
+   * debian/control.debug.in, debian/rules: move python(3)-six to recommends
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 20 Dec 2015 11:05:15 +0100
+ 
  libreoffice (1:5.1.0~rc1-1) experimental; urgency=medium
  
    * New upstream release candidate

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git