From: Raspbian automatic forward porter Date: Thu, 16 Jul 2020 22:00:52 +0000 (+0100) Subject: Merge version 1:6.4.5~rc1-2+rpi1 and 1:7.0.0~rc1-5 to produce 1:7.0.0~rc1-5+rpi1 X-Git-Tag: raspbian/1%7.0.0_rc1-5+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bcc8976a406f9aa6babfb6a657e8488a13e2ac6b;p=libreoffice.git Merge version 1:6.4.5~rc1-2+rpi1 and 1:7.0.0~rc1-5 to produce 1:7.0.0~rc1-5+rpi1 --- aaa897ee70eca047b526906f34b87499a7d55c02 diff --cc debian/changelog index b244cf40e51,2e3039d129e..accb97f4a8e --- a/debian/changelog +++ b/debian/changelog @@@ -1,14 -1,82 +1,92 @@@ - libreoffice (1:6.4.5~rc1-2+rpi1) bullseye-staging; urgency=medium ++libreoffice (1:7.0.0~rc1-5+rpi1) bullseye-staging; urgency=medium + + [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green] + * Disable pdfium, it fails to build for armv6 + + [changes brought forward from 1:6.0.2-1+rpi2 by Peter Michael Green at Fri, 27 Apr 2018 02:14:18 +0000] + * Disable testsuite. + - -- Raspbian forward porter Sun, 28 Jun 2020 17:22:50 +0000 ++ -- Raspbian forward porter Thu, 16 Jul 2020 22:00:46 +0000 + - libreoffice (1:6.4.5~rc1-2) unstable; urgency=medium + libreoffice (1:7.0.0~rc1-5) unstable; urgency=medium + + * debian/control.in: + - fix whitespace + + -- Rene Engelhard Wed, 08 Jul 2020 06:29:17 +0200 + + libreoffice (1:7.0.0~rc1-4) unstable; urgency=medium + + * debian/patches/disable-shortcuts_tab_navigation-uitest.diff: as + name says, hangs in autopkgtest (or chroot), works in the build... + + * debian/rules: + - use --with-extra-buildid instead of --with-build-version + * debian/control*.in: + - make all packages having (moved) config files depend on + libreoffice-common (>= 1:7.0.0~alpha~) (closes: #964471) + + -- Rene Engelhard Tue, 07 Jul 2020 21:00:43 +0200 + + libreoffice (1:7.0.0~rc1-3) unstable; urgency=medium + + * debian/watch: follow rcs + + * debian/control*.in: + - add Breaks:/Replaces: openclipart-libreoffice (<= 1:0.18+dfsg-17) + (closes: #964251) + - fix -dev-gui Breaks + + -- Rene Engelhard Sat, 04 Jul 2020 23:05:58 +0200 + + libreoffice (1:7.0.0~rc1-2) unstable; urgency=medium + + * upload to unstable + + -- Rene Engelhard Sat, 04 Jul 2020 10:17:27 +0200 + + libreoffice (1:7.0.0~rc1-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/tests/patches/java-subsequentcheck-standalone.diff: unfuzzy. + use $(shell .. | sed) instead of $(subst ..) since the latter doesn't + work anymore... + * debian/patches/disable-sc-sw-ScriptOrganizer-test.diff, + debian/patches/sc-disable-UITest_options.diff: remove, works + now (probably because of java-common below..) + + * debian/rules: + - remove unused/-needed CLANG= setting and export CLANG_CC/CLANG_CXX + instead if needed (don't set it for default clang version) + - fix adding {cjk,ctl,ctlseqcheck}_*.xcd to -l10n-* .ucf files + - make make check failures fatal again (on amd64/arm64) + - don't use clang for skia on armel and build-conflict against clang on + it (see #963162, #963167) + + * debian/tests/control: + - fix uicheck-*: + - add new dependencies (cui needs -writer now, too, + sw needs calc for uno.InsertObject) + - add libreoffice-java-common to uicheck-{sc,sw} for RunMacros dialog + test (doesn't fail without but just prints an exception but...) + - disable "smoketest" for now + + * debian/control*.in: + - s/progamming/programming/ (closes: #963753) + - make -common break libreoffice-l10n (<< 7.0) (and other packages having + config files moved) due to registry move to /etc + + * debian/libreoffice-l10n.ucf.in: handle + /etc/libreoffice/registry/res/registry_@ISO@.xcd so that the respective + language actually gets active + + * debian/*.symbols: remove ure (closes: #963895) even though it means + r-deps need to add dependencies manually... + + -- Rene Engelhard Thu, 02 Jul 2020 22:00:34 +0200 + + libreoffice (1:7.0.0~beta2-2) experimental; urgency=medium * debian/patches/apparmor-cleanups.diff: #include (closes: #962903) diff --cc debian/control index bf67c855e0f,ac7bad16ce0..9d6bf0a87c9 --- a/debian/control +++ b/debian/control @@@ -9,12 -9,12 +9,11 @@@ Build-Depends: apparmor bc, bison, bzip2, + clang (>= 1:5.0.2) [alpha amd64 arm64 armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel mips64el ppc64el], coinor-libcoinmp-dev (>= 1.8.3-3), coinor-libcoinutils-dev (>= 2.10.14+repack1-1), - debhelper (>= 10.10.4), debhelper-compat (= 12), - default-jdk (>= 2:1.8) [!hppa !s390 !sparc !hurd-i386 !i386] , - default-jdk (>= 2:1.8-55) [sparc64] , - default-jdk (>= 2:1.9) [i386] , + default-jdk (>= 2:1.9) [!hppa !s390 !sparc !hurd-i386] , default-libmysqlclient-dev, dh-apparmor, dh-python , @@@ -125,7 -145,9 +124,8 @@@ libwpd-dev (>= 0.10), libwpg-dev (>= 0.3), libwps-dev (>= 0.4), - libwps-dev (>= 0.4.9) , libx11-dev, + libx11-xcb-dev, libxaw7-dev, libxcb-icccm4-dev, libxcb1-dev, @@@ -168,6 -193,8 +167,7 @@@ Build-Depends-Indep: ant (>= 1.7.0) [!h rdfind, symlinks Build-Conflicts: amd-libopencl1, + clang [armel], - fonts-opensymbol , nvidia-glx-dev, nvidia-glx-legacy-dev, nvidia-libopencl1