From: Peter Michael Green Date: Sat, 27 Jul 2019 23:42:36 +0000 (+0000) Subject: Manual merge of version 1:6.1.5-3+rpi1 and 1:6.3.0~rc2-1 to produce 1:6.3.0~rc2-1... X-Git-Tag: archive/raspbian/1%6.3.0_rc2-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e33ec2dc646a9f4a41ffb30ee0a4556d428b90e3;p=libreoffice.git Manual merge of version 1:6.1.5-3+rpi1 and 1:6.3.0~rc2-1 to produce 1:6.3.0~rc2-1+rpi1 --- e33ec2dc646a9f4a41ffb30ee0a4556d428b90e3 diff --cc debian/changelog index 9a6583c12ca,9802d286a91..7750e030c25 --- a/debian/changelog +++ b/debian/changelog @@@ -1,21 -1,111 +1,121 @@@ - libreoffice (1:6.1.5-3+rpi1) buster-staging; urgency=medium ++libreoffice (1:6.3.0~rc2-1+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, 15 Apr 2019 14:05:12 +0000 ++ -- Peter Michael Green Sat, 27 Jul 2019 19:08:33 +0000 + - libreoffice (1:6.1.5-3) unstable; urgency=medium + libreoffice (1:6.3.0~rc2-1) unstable; urgency=medium - * debian/patches/jp-JP-Reiwa.diff: Introduce next Japanese gengou - era 'Reiwa', from libreoffice-6-1 branch + * New upstream release candidate + + * debian/rules: + - remove build paths in test.jars Class-Path: + + -- Rene Engelhard Sun, 21 Jul 2019 19:55:13 +0200 + + libreoffice (1:6.3.0~rc1-2) unstable; urgency=high + + * mention fixed security bugs in 1:6.3.0~beta2-1 + * make upload urgency=high because of the above + + * debian/control.in: + - move librelogo from Recommends to Suggests + - bump math depends on fonts-opensymbol to >= 2:102.11 + + -- Rene Engelhard Wed, 17 Jul 2019 06:12:01 +0200 + + libreoffice (1:6.3.0~rc1-1) unstable; urgency=medium + + * New upstream release candidate + + * upload to unstable + + * merge from Ubuntu: + - debian/patches/fix-flaky-bridgetest.diff: add safer float + comparisons to bridgetest equals() (LP: 1832360) + + * debian/control.qt5.in: + - recommend qtgstreamer-plugins-qt5 + * debian/rules: + - handle java version suffixes (strip them), e.g. "-ea" + - disable vlc avmedia plugin (bitrotting, unsupported on linux, + low popcon + * debian/rules, debian/control.in: + and merge -avmedia-gstreamer into -core now that it is the + only alternative + + -- Rene Engelhard Sun, 07 Jul 2019 18:37:57 +0000 + + libreoffice (1:6.3.0~beta2-2) experimental; urgency=medium + + * debian/patches/link-with-latomic-on-mips-el-armel-powerpc.diff: + as name says + + -- Rene Engelhard Sat, 22 Jun 2019 10:39:57 +0200 + + libreoffice (1:6.3.0~beta2-1) experimental; urgency=medium + + * New upstream beta release + - fixes CVE-2019-9848 and CVE-2019-9848 + + -- Rene Engelhard Fri, 21 Jun 2019 19:09:23 +0200 + + libreoffice (1:6.3.0~beta1-2) experimental; urgency=medium + + * debian/patches/0cf4e7f.diff: add from gerrit, fixes 32bit build for the + Qt5 plugin + + -- Rene Engelhard Sun, 02 Jun 2019 20:54:17 +0200 + + libreoffice (1:6.3.0~beta1-1) experimental; urgency=medium + + * New upstream beta release + + -- Rene Engelhard Sat, 01 Jun 2019 11:43:39 +0200 + + libreoffice (1:6.3.0~alpha1-2) experimental; urgency=medium + + * debian/patches/c579879.diff: add from gerrit, fixes 32bit build for the + Qt5 plugin + + -- Rene Engelhard Wed, 15 May 2019 18:12:04 +0200 - -- Rene Engelhard Thu, 11 Apr 2019 22:39:53 +0200 + libreoffice (1:6.3.0~alpha1-1) experimental; urgency=medium - libreoffice (1:6.1.5-2) unstable; urgency=medium + * New upstream alpha release + - now has ui prompt for printer authentication (closes: #795929) + + * debian/rules: + - export JAVA_{SOURCE,TARGET}_VER to 1.7 if building with Java >= 12 + + -- Rene Engelhard Mon, 13 May 2019 20:00:56 +0200 + + libreoffice (1:6.2.4~rc1-1) experimental; urgency=medium + + * New upstream release candidate + - supports JRE installations with unknown java.vendor property + + * debian/patches/java.vendor-Debian.diff: remove again as upstream now + accepts unknown JDKs + + -- Rene Engelhard Sun, 05 May 2019 21:08:43 +0200 + + libreoffice (1:6.2.3~rc2-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/rules: + - replace various $(findstring for arch checks by $(filter + + -- Rene Engelhard Tue, 16 Apr 2019 22:25:38 +0200 + + libreoffice (1:6.2.3~rc1-1) experimental; urgency=medium + + * New upstream release candidate * debian/patches/mention-java-common-package.diff: update message to reflect current config dir... diff --cc debian/control index 770be00e12f,6ea09f12731..46d9b7d399a --- a/debian/control +++ b/debian/control @@@ -25,16 -25,17 +25,16 @@@ Build-Depends: apparmor firebird-dev (>= 3.0.0.32483.ds4-4) [!hppa !mips64 !s390 !sparc], firebird3.0-server-core [!hppa !mips64 !s390 !sparc] , flex (>= 2.3.35), - fontconfig [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , + fontconfig [!kfreebsd-amd64 !kfreebsd-i386 !mips] , fontforge-nox | fontforge, - fonts-crosextra-carlito [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , - fonts-dejavu [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , - fonts-liberation2 [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , - g++ (>= 4:7) [m68k], - gcc (>= 4:7) [m68k], - gdb [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , + fonts-crosextra-carlito [!kfreebsd-amd64 !kfreebsd-i386 !mips] , + fonts-dejavu [!kfreebsd-amd64 !kfreebsd-i386 !mips] , + fonts-liberation2 [!kfreebsd-amd64 !kfreebsd-i386 !mips] , + g++ (>= 4:7), + gcc (>= 4:7), + gdb [!kfreebsd-amd64 !kfreebsd-i386 !mips] , - ghostscript [!kfreebsd-amd64 !kfreebsd-i386 !mips] , gobject-introspection (>= 1.32.0), - gperf, + gperf (>= 3.1), gpg , gpg-agent , gpgconf , @@@ -56,11 -59,12 +55,11 @@@ libcairo2-dev, libcdr-dev (>= 0.1), libclucene-dev (>= 2.3.3.4-4.1), - libcmis-dev (>= 0.5.0-3), + libcmis-dev (>= 0.5.2~), libcommons-logging-java [!hppa !mips64 !s390 !sparc], - libcppunit-dev (>= 1.14) [!kfreebsd-amd64 !kfreebsd-i386 !mips] , libcups2-dev, libcurl4-gnutls-dev, - libdbus-glib-1-dev (>= 0.70), + libdbus-1-dev (>= 0.60), libdconf-dev (>= 0.15.2), libe-book-dev, libe-book-dev (>= 0.1.2) , @@@ -166,9 -168,11 +163,9 @@@ lp-solve (>= 5.5.0.13-5+b1), maven-repo-helper, pkg-config, - pstoedit [!kfreebsd-amd64 !kfreebsd-i386 !mips] , python3, - python3-dev (>= 3.3), - python3-distutils, + python3-dev (>= 3.3) , + python3-distutils , - python3-lxml , qt5-qmake (>= 5.6), qtbase5-dev (>= 5.6), qtbase5-dev-tools (>= 5.6), diff --cc debian/rules index 4a3c490019e,088310599db..dca6a1ed980 --- a/debian/rules +++ b/debian/rules @@@ -521,8 -467,8 +469,8 @@@ PLATFORMID := $(shell grep PLATFORMID d # let's do this only on archs where we have chromium, which is supposedly even only the archs # where alsp pdfium is supported. -OOO_PDFIUM_ARCHS := i386 amd64 armhf arm64 +OOO_PDFIUM_ARCHS := i386 amd64 arm64 - ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_PDFIUM_ARCHS))) + ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_PDFIUM_ARCHS))) ENABLE_PDFIUM=y else ENABLE_PDFIUM=n