From: Raspbian automatic forward porter Date: Sat, 15 Mar 2025 02:40:19 +0000 (+0000) Subject: Merge version 4:24.8.4-3+rpi1 and 4:25.2.1-3 to produce 4:25.2.1-3+rpi1 X-Git-Tag: archive/raspbian/4%25.2.1-3+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0f284e7b90f7f6762e43acf493ec49f6440dd085;p=libreoffice.git Merge version 4:24.8.4-3+rpi1 and 4:25.2.1-3 to produce 4:25.2.1-3+rpi1 --- 0f284e7b90f7f6762e43acf493ec49f6440dd085 diff --cc debian/changelog index 0b7385cabe0,4e758b318bf..bb2b106992f --- a/debian/changelog +++ b/debian/changelog @@@ -1,24 -1,111 +1,128 @@@ - libreoffice (4:24.8.4-3+rpi1) trixie-staging; urgency=medium ++libreoffice (4:25.2.1-3+rpi1) trixie-staging; urgency=medium + + [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. + + [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green] + * Disable pdfium, it fails to build for armv6 + + [changes introduced in 1:7.2.4-3+rpi1 by Peter Michael Green] + * Use clang 11, newer versions cause armv7 contamination issues. + + [changes introduced in 4:24.2.5-1+rpi1 by Peter Michael Green] + * Build with gcc rather than clang. + * Disable skia. + - -- Peter Michael Green Thu, 13 Feb 2025 22:29:04 +0000 ++ -- Raspbian forward porter Sat, 15 Mar 2025 02:40:10 +0000 + - libreoffice (4:24.8.4-3) unstable; urgency=medium + libreoffice (4:25.2.1-3) unstable; urgency=medium - * debian/patches/disable-flaky-tests.diff: disable flaky testLpsolve solver - test on armhf + * debian/patches/system-colamd.diff: restore usage of system-colamd + for now internal lpsolve + * debian/patches/poppler-25.02.diff: fix *runtime* with poppler 25.02 + + * debian/rules: + - build-depend on libsuitesparse-dev also on internal lpsolve case + - move liblpsolve55.so into -calc{,-nogui}; only libsolverlo.so + (in -calc{,-nogui}) needs it + * debian/control.in: add Replaces: to libreoffice-calc{,-nogui} to + libreoffice-core{,-nogui} (<< 4:25.2.1-3~) + + -- Rene Engelhard Thu, 06 Mar 2025 17:41:13 +0100 + + libreoffice (4:25.2.1-2) unstable; urgency=medium + + * debian/rules: + - actually do not set file:///etc/libreoffice/registry in + CONFIGURATION_LAYERS at all. Does not what one expects... Rely on + the /usr/lib/libreoffice/share/registry/main.xcd -> + /etc/libreoffice/registry/main.xcd symlink + - install oo-ldap.xcd.sample oo-ad-ldap.xcd.sample symlinks into + /usr/lib/libreoffice/share/registry + * debian/libreoffice-l10n.preinst.in: + - try to rmdir /etc/libreoffice/registry/res if existing as cleanup + + -- Rene Engelhard Thu, 27 Feb 2025 21:02:59 +0100 + + libreoffice (4:25.2.1-1) unstable; urgency=medium + + * LibreOffice 25.2.1 release (identical to rc2) + + * upload to unstable + + * debian/control.lang.in: also add Pre-Depends: on -common for -l10n-* + (closes: #1098913) + * debian/rules: + - guard extra ENABLE_KF5=y setting for bookworm-backports with ifeq + so that we don't set them on indep builds + + -- Rene Engelhard Wed, 26 Feb 2025 15:47:40 +0100 + + libreoffice (4:25.2.1~rc2-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/patches/disable-flaky-tests.diff: disable sw.SwXAutoTextGroup (for + now) + + * fix up config file handling/registry handling. (overzealous move to /etc + and ucf handling). + Don't mark files only intended for registration of the component and do not + have stuff which the user can/should sensibly edit out of ucf: + - debian/libreoffice-common.ucf, debian/rules: remove everything except + main.xcd as an ucf-managed conffile + - debian/*.ucf: remove for everything except -common (see above) + - debian/*.preinst.in: ucfr --force --purge for the above, also in install + case if the files exists due to intermediate removal of the package in + upgrades + - debian/control.*in: add various Pre-Depends: ucf and update Conflicts:. + Since the Conflicts: above do not ensure a working ordering, add + Pre-Depends: libreoffice-common (>= 4:25.2.1~rc1-3~), too (basically + approved on #debian-devel) + - debian/libreoffice-common.maintscript: symlink_to_dir for + /usr/lib/libreoffice/registry + - debian/patches/split-evoab.diff, patches/split-sdbc-firebird-mariadb.diff: + merge into ... + - debian/patches/splits-adapt-registry.diff: ... here. Add hsqldb.xcu + - debian/rules: + + install new hsqldb.xcu into -sdbc-hsqldb + + add /etc/libreoffice/registry as second search location to + CONFIGURATION_LAYERS instead of overwriting + /usr/lib/libreoffice/share/registry with it + + * debian/rules: + - move armhf away from full make check, in consistency with the other + 32bit archs + * debian/tests/control: disable build-needed tests again... + * debian/tests/uicheck-xmlsecurity, debian/tests/control.in: add initial + uicheck-xmlsecurity autopkgtest, commented out for now + * debian/control.in: add Replaces: libreoffice-common (= 4:24.8.5-1) + in -sdbc-hsqldb, see 4:24.8.4-2s changelog + + -- Rene Engelhard Sun, 23 Feb 2025 21:08:03 +0100 + + libreoffice (4:25.2.1~rc1-2) experimental; urgency=medium + + * debian/rules: + - fix -B builds, only add share/wordbook/xy.dic to -l10n-xy.install + if actually present + + -- Rene Engelhard Sat, 08 Feb 2025 09:24:51 +0100 + + libreoffice (4:25.2.1~rc1-1) experimental; urgency=medium + + * New upstream release candidate + - fixes CVE-2025-1080 + + * debian/rules: + - cleanup '/usr/lib/libreoffice/share/wordbook': + + create empty /usr/lib/libreoffice/share/wordbook/common, now supposed + to be there + + install en-US.dic to -common and {en-GB,en-US,sl,hu_AkH11}.dic to + their respective packages. + + Don't install duplicates of technical.dic + - be strict in which libfbclient2 we allow by forcing << + in shlibs.local * debian/libreoffice-sdbc-firebird.bug-script.in: add again, firebird actually is available only with Experimental features enabled (again, since some time) * debian/control.in, debian/control.firebird.in: add "(embedded)" to the