This is an automated email from the git hooks/post-receive script. sweetshark-guest pushed a commit to branch ubuntu-wily-5.0 in repository libreoffice.
commit 4971940c0c07f4427f8695bcc3fa678ecf50dd39 Author: Bjoern Michaelsen <[email protected]> Date: Wed May 20 14:43:43 2015 +0200 no C++11 on 4.4 branch --- changelog | 2 +- patches/mailmerge-base.diff | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog b/changelog index d2b6ae0..bbd02c6 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,4 @@ -libreoffice (1:4.4.3~rc2-0ubuntu1~vivid4) vivid; urgency=medium +libreoffice (1:4.4.3~rc2-0ubuntu1~vivid5) vivid; urgency=medium * Fix mailmerge without libreoffice-base scenario diff --git a/patches/mailmerge-base.diff b/patches/mailmerge-base.diff index 318f540..aea0ad0 100644 --- a/patches/mailmerge-base.diff +++ b/patches/mailmerge-base.diff @@ -140,7 +140,7 @@ diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx + using namespace org::freedesktop::PackageKit; + using namespace svtools; + css::uno::Reference< XSyncDbusSessionHelper > xSyncDbusSessionHelper(SyncDbusSessionHelper::create(comphelper::getProcessComponentContext())); -+ const css::uno::Sequence< OUString > vPackages{ "libreoffice-base" }; ++ css::uno::Sequence< OUString > vPackages(1); vPackages[0] = "libreoffice-base"; + OUString sInteraction; + xSyncDbusSessionHelper->InstallPackageNames(0, vPackages, sInteraction); + SolarMutexGuard aGuard; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
