This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch debian-experimental-5.0 in repository libreoffice.
commit 78e38dd17b84067073eb8c378aba6c10ef8b1d86 Merge: 8a6326a f8bb0bd Author: Rene Engelhard <[email protected]> Date: Sat Jan 16 14:35:22 2016 +0100 Merge remote-tracking branch 'origin/master' into debian-experimental-5.0 Conflicts: changelog changelog | 19 ++++++ control | 10 +-- control.debug.in | 6 +- patches/disable-db-tests.diff | 92 ++++++++++++++++++++++++-- patches/smoketest-disable-extension-tests.diff | 17 +++-- rules | 6 +- tests/control | 2 +- tests/junit-subsequentcheck | 3 +- 8 files changed, 128 insertions(+), 27 deletions(-) diff --cc changelog index 18580f9,84945cb..e8665be --- a/changelog +++ b/changelog @@@ -1,13 -1,22 +1,32 @@@ +libreoffice (1:5.0.5~rc1~git201560116-1) UNRELEASED; urgency=medium + + * New upstream snapshot + + * debian/rules: + - -officebean is a arch-dep package, move pom generation and mh_* + calls for it to install-arch... + + -- Rene Engelhard <[email protected]> Sat, 19 Dec 2015 01:50:15 +0100 + + libreoffice (1:5.0.4-1) UNRELEASED; urgency=medium + + * LibreOffice 5.0.4 final (identical to rc2) + + * debian/patches/disable-db-tests.diff, + debian/patches/smoketest-disable-extension-tests.diff: make apply again... + + * 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. + * debian/control.debug.in: recommend gdb + * debian/control.debug.in, debian/rules: move python(3)-six to recommends + and recommend python3-six on sid as "gdb" uses python3. + * debian/rules: + - build-depend on libpng-dev instead of libpng12-dev (closes: #662411) + + -- Rene Engelhard <[email protected]> Tue, 05 Jan 2016 15:45:29 +0100 + libreoffice (1:5.0.4~rc2-2) unstable; urgency=medium * reupload with correct 1:5.0.4~rc1-1 base... -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
