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 5ba9a17b047bc43af8db56343b73c77d61e50ab3 Merge: 5ea248f 211260d Author: Rene Engelhard <[email protected]> Date: Sat Jan 16 13:37:01 2016 +0100 Merge remote-tracking branch 'origin/debian-experimental-5.0' into debian-experimental-5.1 Conflicts: changelog changelog | 8 ++++++++ rules | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --cc changelog index 9f39528,ca02dd0..390ba7b --- a/changelog +++ b/changelog @@@ -1,42 -1,28 +1,50 @@@ -libreoffice (1:5.0.5~rc1~git20151219-1) UNRELEASED; urgency=medium - - * New upstream snapshot ++libreoffice (1:5.1.0~rc2-2) UNRELEASED; urgency=medium + + * 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~rc2-2) unstable; urgency=medium +libreoffice (1:5.1.0~rc2-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/patches/disable-db-tests.diff, + debian/patches/smoketest-disable-extension-tests.diff: make apply again... - * reupload with correct 1:5.0.4~rc1-1 base... + * 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. + * 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]> Mon, 14 Dec 2015 16:30:44 +0100 + -- Rene Engelhard <[email protected]> Wed, 13 Jan 2016 17:38:32 +0100 -libreoffice (1:5.0.4~rc2-1) unstable; urgency=medium +libreoffice (1:5.1.0~rc1-1) experimental; urgency=medium * New upstream release candidate + - doesn't link evoab2 to gtk2 anymore (closes: #807640) - -- Rene Engelhard <[email protected]> Fri, 11 Dec 2015 08:11:41 +0100 + * debian/patches/disable-npapi-plugin-support.diff: as name says, + the only serious usecase is the doomed Flash anyway and it's + causes a link against gtk2 in -core (closes: #807601) -libreoffice (1:5.0.4~rc1-1) unstable; urgency=medium + -- Rene Engelhard <[email protected]> Wed, 16 Dec 2015 10:15:06 +0100 - * New upstream release candidate +libreoffice (1:5.1.0~beta2-1) experimental; urgency=medium + + * New upstream beta release - fixes crash when selecting the border style in some window managers (closes: #801504) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
