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 54f3ea481c5f649647267a0d83b72bdf42198dd0 Merge: 771fc5e 073df16 Author: Rene Engelhard <[email protected]> Date: Sun May 1 14:23:18 2016 +0200 Merge remote-tracking branch 'origin/master' into debian-experimental-5.2 Conflicts: changelog changelog | 2 ++ rules | 8 ++++++++ 2 files changed, 10 insertions(+) diff --cc changelog index c817703,3a3444a..48b28a3 --- a/changelog +++ b/changelog @@@ -1,29 -1,10 +1,31 @@@ -libreoffice (1:5.1.3~rc1-2) UNRELEASED; urgency=medium +libreoffice (1:5.2.0~alpha1-2) UNRELEASED; urgency=medium * debian/rules: + - print error in control without gcj-jdk installed + - don't try to run set GCJ_JAWT_DEPENDS if GCJ_VERSION is unset + - add initial build profile support: nodoc and nocheck - -- Rene Engelhard <[email protected]> Sun, 24 Apr 2016 00:02:55 +0200 + -- Rene Engelhard <[email protected]> Tue, 26 Apr 2016 21:33:47 +0200 + +libreoffice (1:5.2.0~alpha1-1) experimental; urgency=medium + + * New upstream alpha release + - fixes SVG t(ext s)pan import (closes: #665094) + + * debian/rules, debian/control.gtk3.in, debian/*.links: move + liblibreofficekitgtk.so into an own package, as we have + libreofficekit-{dev,data} anyway. Make liblibreofficekitgtk depend on + libreofficekit-data + * debian/rules, debian/control.in, debian/libreoffice-gtk.*: rename -gtk + to -gtk2 + * debian/control.sdk.in, debian/rules: move arch-indep SDK stuff into new + -dev-common. Move g++-mingw-w64-i686 to BUILD_DEPS_INDEP and only try to + (re)build unowinreg.dll in build-indep. Remove arch-qualifiers. + * debian/uno-libs3.symbols: update + * debian/tests/control.in, debian/tests/sdk-examples: remove unowinreg.dll + special-casing, we now have unowinreg.dll in a Arch: all. Depend on that. + + -- Rene Engelhard <[email protected]> Thu, 21 Apr 2016 22:26:49 +0200 libreoffice (1:5.1.3~rc1-1) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
