This is an automated email from the git hooks/post-receive script. sweetshark-guest pushed a commit to branch ubuntu-vivid-4.4 in repository libreoffice.
commit 0177026880c7904540d8662031d2b9b7083cca9b Author: Bjoern Michaelsen <[email protected]> Date: Wed Jan 28 18:14:04 2015 +0100 use system mwaw now that 0.3.4-1 is synced to main --- changelog | 1 + rules | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog b/changelog index cd04655..833f053 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,7 @@ libreoffice (1:4.4.0~rc3-1ubuntu1) UNRELEASED; urgency=medium * merge from Debian + * use system mwaw, now that 0.3.4-1 is synced to main (LP: #1410883) -- Bjoern Michaelsen <[email protected]> Wed, 28 Jan 2015 17:40:59 +0100 diff --git a/rules b/rules index 4533074..f1c3662 100755 --- a/rules +++ b/rules @@ -668,9 +668,8 @@ ifeq "$(DEB_VENDOR)" "Ubuntu" USE_VLC:=n #temp. hacks ENABLE_EVO2:=n - SYSTEM_STUFF := $(filter-out libmwaw libetonyek, $(SYSTEM_STUFF)) + SYSTEM_STUFF := $(filter-out libetonyek, $(SYSTEM_STUFF)) SYSTEM_STUFF := $(filter-out orcus libgltf coinmp, $(SYSTEM_STUFF)) - # libmwaw 0.3.1 is in vivid/universe, needs MIR, was shipped with LibreOffice in utopic/main # libetonyek 0.1.1 is in vivid/universe, needs MIR, was shipped with LibreOffice in utopic/main # libgltf-dev (0.0.2-2) is in vivid/universe, needs MIR, new with LibreOffice 4.4 # libcoinor-libcoinmp-dev is in vivid/universe, needs MIR, new with LibreOffice 4.4 -- 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]
