This is an automated email from the git hooks/post-receive script. sweetshark-guest pushed a commit to tag libreoffice_5.0.1-0ubuntu2 in repository libreoffice.
commit cbaa571bf922d143c37cebe0bf34455165bcee9c Author: Matthias Klose <[email protected]> Date: Thu Oct 1 15:22:11 2015 +0200 build for arm64 and ppc64el, use system libcppunit, libetonyek, liborcus, libpagemaker, libwps and libcmis --- changelog | 9 +++++++++ patches/series | 2 +- rules | 12 +++--------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/changelog b/changelog index 3ffe3df..070d032 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,12 @@ +libreoffice (1:5.0.1-0ubuntu2) wily; urgency=medium + + * Build for arm64 and ppc64el. + * Build using system libraries for libcppunit, libetonyek, liborcus, + libpagemaker, libwps and libcmis. The internal copies are not updated + for at least ppc64el. + + -- Matthias Klose <[email protected]> Fri, 11 Sep 2015 17:22:56 +0200 + libreoffice (1:5.0.1-0ubuntu1) wily; urgency=medium * new final upstream release diff --git a/patches/series b/patches/series index d861443..0cdfdfa 100644 --- a/patches/series +++ b/patches/series @@ -26,7 +26,7 @@ odk-no-dot.diff hppa-is-32bit.diff gcj-no-bitness-check.diff rsc-no-error-about-unknown-switch.diff -#liborcus-0.9.1.diff +liborcus-0.9.1.diff disable-tiledrendering-test.diff gtk3-rtl.diff #lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff diff --git a/rules b/rules index f9f6c18..76e5238 100755 --- a/rules +++ b/rules @@ -84,7 +84,7 @@ endif ######### # Default package configuration # -OOO_ARCHS = alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +OOO_ARCHS = alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc PATCHSET=$(DEB_VENDOR) BUILD_DEPS=\ autoconf,\ @@ -191,6 +191,7 @@ SYSTEM_STUFF += libfreehand # system anyways if enabled SYSTEM_STUFF += libebook SYSTEM_STUFF += libabw +SYSTEM_STUFF += libpagemaker BUILD_CAIROCANVAS=y SYSTEM_STUFF += cairo CAIRO_FONTS_PATCH=y @@ -718,20 +719,13 @@ ifeq "$(DEB_VENDOR)" "Ubuntu" USE_VLC:=n #temp. hacks ENABLE_EVO2:=n - SYSTEM_STUFF := $(filter-out orcus, $(SYSTEM_STUFF)) + #SYSTEM_STUFF := $(filter-out orcus, $(SYSTEM_STUFF)) # libgltf-dev (0.0.2-2) is in vivid/universe, needs MIR, was shipped with LibreOffice 4.4 in vivid # libcoinor-libcoinmp-dev is in vivid/universe, needs MIR, was shipped with LibreOffice 4.4 in vivid SYSTEM_STUFF := $(filter-out libgltf coinmp, $(SYSTEM_STUFF)) - # libetonyek 0.1.1 is in vivid/universe, needs MIR, was shipped with LibreOffice 4.3 in utopic - SYSTEM_STUFF := $(filter-out libetonyek, $(SYSTEM_STUFF)) - - # libwps 0.4-4 is not yet in wily/main, no MIR needed, needs sync from debian experimental - SYSTEM_STUFF := $(filter-out libwps, $(SYSTEM_STUFF)) - SYSTEM_STUFF := $(filter-out opencollada collada2gltf, $(SYSTEM_STUFF)) - SYSTEM_STUFF := $(filter-out libcmis cppunit, $(SYSTEM_STUFF)) ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH))) ENABLE_HELP=n endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
