From: Raspbian automatic forward porter Date: Sat, 25 Sep 2021 14:52:59 +0000 (+0100) Subject: Merge version 1:7.1.5-2+rpi1 and 1:7.2.1-3 to produce 1:7.2.1-3+rpi1 X-Git-Tag: raspbian/1%7.2.1-3+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f1b846277593a8b09aa305540be14277b0bee39b;p=libreoffice.git Merge version 1:7.1.5-2+rpi1 and 1:7.2.1-3 to produce 1:7.2.1-3+rpi1 --- 9cec7d805258074ff7388cd4f5e3fd819d769f17 diff --cc debian/changelog index 23180fe7fc8,d93b1f95172..271c7c4d2ca --- a/debian/changelog +++ b/debian/changelog @@@ -1,23 -1,79 +1,89 @@@ - libreoffice (1:7.1.5-2+rpi1) bookworm-staging; urgency=medium ++libreoffice (1:7.2.1-3+rpi1) bookworm-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 + - -- Raspbian forward porter Wed, 25 Aug 2021 00:04:02 +0000 ++ -- Raspbian forward porter Sat, 25 Sep 2021 14:52:53 +0000 + - libreoffice (1:7.1.5-2) unstable; urgency=medium + libreoffice (1:7.2.1-3) unstable; urgency=medium - * debian/rules, debian/tests/control.in: - - run junit autopkgtest only on OOO_JUNIT_ARCHS (aka amd64/arm64) + * debian/control.ure.in: + - also add Breaks: to << 7.2.0 libreoffice-cores to ure... + (closes: #994624) - -- Rene Engelhard Wed, 18 Aug 2021 08:56:00 +0200 + -- Rene Engelhard Sun, 19 Sep 2021 13:18:06 +0200 - libreoffice (1:7.1.5-1) unstable; urgency=medium + libreoffice (1:7.2.1-2) unstable; urgency=medium - * "New" upstream release + * debian/control.in. + - bump ure dependency for libreoffice-core to (>= 1:7.2.0~) + (closes: #994624) + + -- Rene Engelhard Sun, 19 Sep 2021 12:07:40 +0200 + + libreoffice (1:7.2.1-1) unstable; urgency=medium + + * LibreOffice 7.2.1 release (identical to rc2) + + * debian/patches/qt5-fix-popups.diff: add patch from libreoffice-7-2 to + fix popup menus in qt5 + * debian/patches/bison-3.8.diff: fix build with bison 3.8, from master + * debian/patches/freetype-2.11.diff: fix (skia) build with freetype 2.11 + + * debian/control.plasma.in: make -plasma recommend -kf5 (closes: #994445) + + * debian/rules, debian/clang_wrapper: remove again, doesn't work and + prevents a clang build/a build of skia with clang + + * upload to unstable + + -- Rene Engelhard Thu, 16 Sep 2021 11:04:20 +0200 + + libreoffice (1:7.2.1~rc2-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/tests/control.in: which doxygen -> command -v doxygen + + -- Rene Engelhard Fri, 27 Aug 2021 06:44:31 +0200 + + libreoffice (1:7.2.1~rc1-2) experimental; urgency=medium + + * reupload with correct control... + + -- Rene Engelhard Fri, 27 Aug 2021 06:44:31 +0200 + + libreoffice (1:7.2.1~rc1-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/watch: add uversionmangle for releases (7.2.0.4 -> 7.2.0) + + -- Rene Engelhard Thu, 26 Aug 2021 21:11:34 +0200 + + libreoffice (1:7.2.0-3) unstable; urgency=medium + + * debian/patches/revert-raspberry-pi-buildfixes.diff: remove again + * debian/patches/fix-arm-bridges.diff: add targetted upstream fix from + gerrit + + * debian/watch: watch only releases again + * debian/rules: + - chmod 755 the clang wrappers since otherwise they + are ignored + - explicitely set ENABLE_JUNIT4=y in build-indep builds if + BUILD_TEST_PACKAGES=y + + [ merge from Ubuntu ] + * Add Conflicts/Replaces for move of liblosessioninstalllo.so + (closes: #992779) + + -- Rene Engelhard Mon, 23 Aug 2021 19:29:09 +0200 + + libreoffice (1:7.2.0-2) unstable; urgency=medium * upload to unstable diff --cc debian/control index 0c97e43f554,e898344c90d..479df16b90a --- a/debian/control +++ b/debian/control @@@ -45,9 -60,7 +45,6 @@@ Build-Depends: apparmor libcdr-dev (<< 0.2~), libcdr-dev (>= 0.1), libclucene-dev (>= 2.3.3.4-4.1), - libcmis-dev (<< 0.6~), - libcmis-dev (>= 0.5.2~), - libcommons-logging-java [!hppa !mips64 !s390 !sparc] , - libcppunit-dev (>= 1.14) [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , libcups2-dev, libcurl4-gnutls-dev, libdbus-1-dev (>= 0.60), @@@ -169,9 -184,13 +165,11 @@@ libxtst-dev, libzmf-dev, libzmf-dev (<< 0.1~), + libzxingcore-dev, - locales [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , lp-solve (>= 5.5.0.13-5+b1), maven-repo-helper, pkg-config, + poppler-data , - pstoedit [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , python3, python3-dev (>= 3.3) , python3-distutils ,