From: Raspbian forward pporter Date: Sun, 10 Sep 2017 05:13:07 +0000 (+0100) Subject: Manual merge of version 1:5.4.0-1+rpi1 and 1:5.4.1-1 to produce 1:5.4.1-1+rpi1 X-Git-Tag: archive/raspbian/1%5.4.1-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2369b437ecb5a1c7935778d7bd7297cc3d954da7;p=libreoffice.git Manual merge of version 1:5.4.0-1+rpi1 and 1:5.4.1-1 to produce 1:5.4.1-1+rpi1 --- 2369b437ecb5a1c7935778d7bd7297cc3d954da7 diff --cc debian/changelog index 12dca6ccc47,1d5a422ae89..346f09ceda8 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,39 +1,49 @@@ - libreoffice (1:5.4.0-1+rpi1) buster-staging; urgency=medium ++libreoffice (1:5.4.1-1+rpi1) buster-staging; urgency=medium + + [changes brought forward from 1:5.2.4-2+rpi1 by Peter Michael Green at Sat, 07 Jan 2017 01:42:16 +0000] + * Disable chromium stuff as we don't currently have chromium in the Raspbian + repository. + [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green] + * Disable pdfium, it fails to build for armv6 + - -- Peter Michale Green Mon, 07 Aug 2017 05:42:17 +0000 ++ -- Raspbian forward porter Sun, 10 Sep 2017 05:13:00 +0000 ++ + libreoffice (1:5.4.1-1) unstable; urgency=medium + + * New upstream release + - fixes middle click paste (closes: #871588) + + * debian/patches/stop-shipping-mimelnk-desktop-files.diff: as name says + (closes: #872001) + * debian/patches/java9.diff: backport Java 9 patch from master + + * debian/rules: + - install appstream stuff into /usr/share/metainfo. sigh. + - make -writer-dbgsym recommend -core-dbgsym as it wants some gdb stuff + from it + - set UNO_LIBS_DBG_ROOT to fix gdb helper installation for uno-libs3 again + and make -core-dbgsym recommends uno-libs3-dbgsym (same reason as above) + - generate and install apparmor profiles + - be consequent and bump the build-dependencies for the DLP libs when + we run the tests; based on patch by Rico Tzschichholz + - run dh_strip_nondeterminism + - disable -kde and the (unmaintained for LO) oxygen theme. + Qt4 should go away. See + https://lists.debian.org/debian-devel-announce/2017/08/msg00006.html + - set locale to en-US.UTF-8 also for make check, the dbaccess tests + fail in some frenchy locale... + - remove libbz2-dev from Build-Depends, coinutils got fixed + - move pagein-{calc,draw,impress,writer} to their respective packages + - move dk.mk from -dev-common to -dev as it's not arch-indep, thanks + Rico Tzschichholz + * debian/scripts/gid2pkgdirs.sh: fix move of types/*.rdb and services/*.rdb + to core and move pagein-common there too. They reference libmergedlo.so + which doesn't exist on all archs (closes: #873443) + * debian/control*in: + - move to policy 4.0.1; extra -> optional + - Breaks/Replaces for above + + -- Rene Engelhard Tue, 29 Aug 2017 16:39:44 +0000 libreoffice (1:5.4.0-1) unstable; urgency=medium diff --cc debian/control index 7b1aa897e06,e3b081fc148..395bdfd258b --- a/debian/control +++ b/debian/control @@@ -11,8 -11,9 +11,8 @@@ Build-Depends: ant (>= 1.7.0) [!hppa !i binutils (>= 2.23) [mips mipsel], bison, bzip2, - coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2), - coinor-libcoinutils-dev (>= 2.9.15-3.1), - chromium (>= 39.0.2171.71-1) [amd64 arm64 armhf i386], + coinor-libcoinmp-dev (>= 1.8.3-2), + coinor-libcoinutils-dev (>= 2.10.14+repack1-1), debhelper (>= 10), default-jdk (>= 1:1.6) [!hppa !mips64 !s390 !sparc], default-jdk (>= 2:1.7-52.1) [kfreebsd-any], @@@ -38,7 -40,7 +39,6 @@@ imagemagick [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , java-common (>= 0.49), javahelper (>= 0.37~), - kdelibs5-dev (>= 4:4.3.4), - junit4 (>= 4.8.2-2) [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , libabw-dev (>= 0.1), libarchive-zip-perl [!hppa !ia64 !mips64 !s390 !sparc], libavahi-client-dev, @@@ -139,8 -147,8 +142,7 @@@ libzmf-dev, locales [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , lp-solve (>= 5.5.0.13-5+b1), - make (>= 3.81-8.2), maven-repo-helper, - opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) [amd64 i386], pkg-config, pstoedit [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , python3,