[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit 7bc564919f8e3b3a4df4376d8d947b56363790d4
Merge: cf4eaf8 0661307
Author: Rene Engelhard <rene@debian.org>
Date: Wed Dec 23 11:26:40 2015 +0100
Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
Conflicts:
changelog
changelog | 4 ++
patches/disable-db-tests.diff | 92 ++++++++++++++++++++++++--
patches/smoketest-disable-extension-tests.diff | 17 +++--
3 files changed, 98 insertions(+), 15 deletions(-)
diff --cc changelog
index 18e9473,c99d3e8..218be58
--- a/changelog
+++ b/changelog
@@@ -1,13 -1,11 +1,17 @@@
-libreoffice (1:5.0.4-1) UNRELEASED; urgency=medium
+libreoffice (1:5.1.0~rc2~git20151222-1) UNRELEASED; urgency=medium
- * LibreOffice 5.0.4 final (identical to rc2)
+ * New upstream snapshot
+ * debian/patches/disable-db-tests.diff,
+ debian/patches/smoketest-disable-extension-tests.diff: make apply again...
+
+ * 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/control: depend on ure-dbg and uno-libs3-dbg, too
* 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.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: