From: Raspbian automatic forward porter Date: Mon, 17 Feb 2020 22:17:36 +0000 (+0000) Subject: Merge version 1:6.3.4-2+rpi1 and 1:6.4.1~rc1-2 to produce 1:6.4.1~rc1-2+rpi1 X-Git-Tag: archive/raspbian/1%6.4.1_rc1-2+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=71f48fde8d64398aaa81a24304ba073e43853560;p=libreoffice.git Merge version 1:6.3.4-2+rpi1 and 1:6.4.1~rc1-2 to produce 1:6.4.1~rc1-2+rpi1 --- 71f48fde8d64398aaa81a24304ba073e43853560 diff --cc debian/changelog index 6e30dedd7f5,d0156d6334b..e23c20bf2cd --- a/debian/changelog +++ b/debian/changelog @@@ -1,22 -1,182 +1,192 @@@ - libreoffice (1:6.3.4-2+rpi1) bullseye-staging; urgency=medium ++libreoffice (1:6.4.1~rc1-2+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 Mon, 16 Dec 2019 16:05:00 +0000 ++ -- Raspbian forward porter Mon, 17 Feb 2020 22:17:32 +0000 + - libreoffice (1:6.3.4-2) unstable; urgency=medium + libreoffice (1:6.4.1~rc1-2) unstable; urgency=medium - * reupload with full languages in control... + * update Replaces: in -help-* to libreoffice-help-common (<< 1:6.4.1~rc1-1) + (closes: #950833) - -- Rene Engelhard Thu, 12 Dec 2019 22:52:05 +0100 + -- Rene Engelhard Fri, 07 Feb 2020 16:26:56 +0100 - libreoffice (1:6.3.4-1) unstable; urgency=medium + libreoffice (1:6.4.1~rc1-1) unstable; urgency=medium - * New upstream release + * New upstream release candidate + - fixes opengl slide transitions with glm >= 0.9.9 (closes: #917927) + + * debian/patches/no-packagekit-per-default.diff: revert configure revert; + add configuration item and use it (closes: #950225) + * debian/patches/debian-vendor.diff: handle Debians vendor correctly, extracted + from old no-packagekit-per-default.diff + + * debian/rules: + - don't install libdbulo.so in -base-nogui (contains Base UI) + - generailize OOO_VENDOR setting to use DEB_VENDOR/DEB_PARENT_VENDOR + - add fonts-alef to he's FONT_RECOMMENDS + - remove appdata files in *-nogui + + -- Rene Engelhard Wed, 05 Feb 2020 22:27:44 +0100 + + libreoffice (1:6.4.0-1) unstable; urgency=medium + + * LibreOffice 6.4.0 final release (identical to rc3) + + * debian/patches/disable-sc-ScriptOrganizer-test.diff: disable sc + ScriptOrganizer test uitest for now - fails on arm64 buildds + (and only in sc, not in sw) but works on the porterbox... + * debian/libreoffice-l10n-{in,kmr,za}.maintscript: fix (closes: #946470) + + -- Rene Engelhard Wed, 29 Jan 2020 16:25:26 +0100 + + libreoffice (1:6.4.0~rc3-1) unstable; urgency=medium + + * New upstream release candidate + + -- Rene Engelhard Thu, 23 Jan 2020 18:08:28 +0100 + + libreoffice (1:6.4.0~rc2-2) unstable; urgency=medium + + * oops, reupload with all languages in control.... + + -- Rene Engelhard Thu, 09 Jan 2020 19:46:13 +0000 + + libreoffice (1:6.4.0~rc2-1) unstable; urgency=medium + + * New upstream release candidate + + * debian/rules: + - stop special-casing ure, uno-libs-private, libuno* epoch-wise to avoid + confusion (especially since it was missed to apply that special-casing to + lib*-java anyways) + - use filter for setting BUILD_NOGUI_PACKAGES and add ppc64 to OOO_NOGUI_ARCHS + (closes: #948120) + - add missing dh_python3 call for python3-access2base + * debian/control.*.in: + - make libjuh-java Depends: ure since it loadLibrary()'s libjuh.so; + same with libjurt-java (libjava_uno.so) + - add some explicit dependencies on the new java packages to where they are + mentioned in Class-Path: + - suggest odbc-mdbtools instead of just mdbtools + - remove obsolete alternatives from ${java-runtime-depends} and suggest that + instead of java5-runtime in ure + * debian/rules, debian/control.in: + - make libofficebean-java arch-dep and install libofficebean.so there + (into /usr/lib/jni with a symlink from /usr/lib/libreoffice/program); + make libreoffice-officebean a transitional package for libofficebean-java + + -- Rene Engelhard Wed, 08 Jan 2020 17:22:52 +0000 + + libreoffice (1:6.4.0~rc1-6) unstable; urgency=medium + + * debian/control.in, debian/control.ure.in: + - fix typo: s/java:Depednds/java:Depends/g + * debian/rules: + - fix the URE/unoil/officebean jar splitout to actually work as + expected (closes: #947909). Fix smoketest.jar move to + -smoketest-data + - don't try to remove the bogus base-files dependencies manually, + use jh_depends -Xbase-files... + * debian/control.in, debian/control.ure.in: + - update Breaks:/Replaces: and add "reverse" Breaks:/Replaces:, too + + -- Rene Engelhard Fri, 03 Jan 2020 19:34:21 +0100 + + libreoffice (1:6.4.0~rc1-5) unstable; urgency=medium + + * debian/control.ure.in: + - fix Breaks:/Replaces: on ure, it has no epoch... (closes: #947853) + + -- Rene Engelhard Tue, 31 Dec 2019 18:41:06 +0000 + + libreoffice (1:6.4.0~rc1-4) unstable; urgency=medium + + * debian/rules: + - limit parallelism for running the tests to 1 so one can see + directly which test fails/hangs; keep the second run in case + of a failure nevertheless for flaky tests... + - disable coinmp for now, tests hang + + -- Rene Engelhard Mon, 30 Dec 2019 16:54:09 +0100 + + libreoffice (1:6.4.0~rc1-3) unstable; urgency=medium + + readd test fixes which somewow got lost in preparation of -2: + + * debian/tests/control: + - smoktest: add missing -nogui and add missing libreoffice-base-nogui + to Depends:; but use calc and core since the test actually seems to want + to use something from it + - junit: use the "GUI" packages + * debian/control*in: + - add more Breaks:/Replaces: for the new split-out Java packages (and + libreoffice-smoketest-data) (closes: #947446) + * debian/libreoffice-common.doc-base: also add Files: + + -- Rene Engelhard Fri, 27 Dec 2019 10:51:35 +0100 + + libreoffice (1:6.4.0~rc1-2) unstable; urgency=medium + + * debian/rules, debian/control*in: + - make -nogui variant less confusing and create them for all "UI" + packages (also saves some space since some (not needed for nogui) + will be gone from -nogui) + * debian/rules, debian/libreoffice-calc-nogui.lintian-overrides: + - remove lib*uilo.so and *.desktop from *-nogui + * debian/tests/control: + - fix typo + - use the new -nogui packages created above in the smoketest test + + -- Rene Engelhard Sun, 22 Dec 2019 18:37:42 +0100 + + libreoffice (1:6.4.0~rc1-1) unstable; urgency=medium + + * LibreOffice 6.4.0 release candidate 1 + * upload to unstable + + * debian/patches/sc-opengl-optional.diff: don't rely on + isVCLOpenGLEnabled if HEAVE_FEATURE_UI isn't defined + + * debian/control.in, debian/rules: create a libreoffice-calc-nogui + for use with libreoffice-core-nogui + * debian/rules: + - cleanup, introduce a BUILD_NOGUI_PACKAGES=y/n and only + build -nogui on amd64/i386/arm64/s390x/ppc64el so save build cycles on + the other architectures (more or less double build) + - add explicit libgl-dev build-dep + + * debian/control.firebird.in: allow libreoffice-core-nogui + * debian/control.in: + - allow libreoffice-core-nogui for libreoffice-dev + - move python-access2base to "python" and libreoffice-sdbc-mysql to + "database" like the other -sdbc-* + * debian/tests/control: + - improve test depends for nogui: + + make odk-test-examples/test-extension-* depend on + libreoffice-core-nogui only + + make smoketest and junit depend on libreoffice-{calc,core}-nogui + instead of their GUI counterparts and use the needed packages + instead of the "libreoffice" metapackage + - make odk-test-examples depend on libofficebean-java instead + of libreoffice-officebean + + -- Rene Engelhard Thu, 19 Dec 2019 18:59:30 +0100 + + libreoffice (1:6.4.0~beta1-4) experimental; urgency=medium + + * re-enable introspection which was accidentially kept disabled after a + python3.8 test rebuild... + * re-enable building of the "test packages" + (-smoketest-data, -subsequentcheckbase) + + -- Rene Engelhard Sun, 15 Dec 2019 10:29:19 +0000 + + libreoffice (1:6.4.0~beta1-3) experimental; urgency=medium * debian/patches/fix-build-with-poppler-0.83.diff: as name says diff --cc debian/control index 57435ff1b9b,fbd88fddead..cd3b6d55b29 --- a/debian/control +++ b/debian/control @@@ -37,13 -36,16 +35,13 @@@ Build-Depends: apparmor gpg , gpg-agent , gpgconf , - hunspell-en-us [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , hyphen-en-us [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , - java-common (>= 0.61), - javahelper (>= 0.37~), - imagemagick [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , + java-common (>= 0.61) , + javahelper (>= 0.37~) , - junit4 (>= 4.8.2-2) [amd64 arm64] , libabw-dev (>= 0.1), - libarchive-zip-perl [!hppa !mips64 !s390 !sparc], + libarchive-zip-perl [!hppa !mips64 !s390 !sparc] , libavahi-client-dev, - libbase-java [!hppa !mips64 !s390 !sparc], + libbase-java [!hppa !mips64 !s390 !sparc] , libbluetooth-dev [linux-any], libboost-date-time-dev (>= 1.58), libboost-dev (>= 1.58), @@@ -55,7 -57,8 +53,7 @@@ libcdr-dev (>= 0.1), libclucene-dev (>= 2.3.3.4-4.1), libcmis-dev (>= 0.5.2~), - libcommons-logging-java [!hppa !mips64 !s390 !sparc], + 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), @@@ -176,12 -182,13 +175,12 @@@ xsltproc, zip, zlib1g-dev - Build-Depends-Indep: ant (>= 1.7.0) [!hppa !mips64 !s390 !sparc], - ant-optional (>= 1.7.0) [!hppa !mips64 !s390 !sparc], + Build-Depends-Indep: ant (>= 1.7.0) [!hppa !mips64 !s390 !sparc] , + ant-optional (>= 1.7.0) [!hppa !mips64 !s390 !sparc] , doxygen (>= 1.8.4) , - g++-mingw-w64-i686, gettext, graphviz , - libbsh-java, + libbsh-java , rdfind, symlinks Build-Conflicts: amd-libopencl1,