diff -Nru libreoffice-5.2.7/debian/changelog libreoffice-5.2.7/debian/changelog --- libreoffice-5.2.7/debian/changelog 2018-02-22 10:14:18.000000000 +0000 +++ libreoffice-5.2.7/debian/changelog 2018-03-12 14:27:13.000000000 +0000 @@ -1,3 +1,11 @@ +libreoffice (1:5.2.7-1+rpi1+deb9u3) stretch-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. + + -- Raspbian forward porter Mon, 12 Mar 2018 14:27:13 +0000 + libreoffice (1:5.2.7-1+deb9u3) stretch; urgency=medium * debian/patches/WEBSERVICE-DDE.diff: diff -Nru libreoffice-5.2.7/debian/control libreoffice-5.2.7/debian/control --- libreoffice-5.2.7/debian/control 2018-02-22 10:14:18.000000000 +0000 +++ libreoffice-5.2.7/debian/control 2018-03-12 14:27:13.000000000 +0000 @@ -11,7 +11,6 @@ binutils (>= 2.23) [mips mipsel], bison, bzip2, - chromium (>= 39.0.2171.71-1) [i386 amd64 armhf arm64], coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2), coinor-libcoinutils-dev (>= 2.9.15-3.1), debhelper (>= 9.20160114), @@ -27,8 +26,8 @@ fontconfig [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc !sparc64] , fonts-crosextra-carlito [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc !sparc64] , fonts-liberation [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc !sparc64] , - g++-6 [hppa ia64 s390 sparc], - gcc-6 [hppa ia64 s390 sparc], + g++- [hppa ia64 s390 sparc], + gcc- [hppa ia64 s390 sparc], gcj-jdk [hppa ia64 s390 sparc], gcj-native-helper [hppa ia64 s390 sparc], gdb [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc !sparc64] , @@ -37,7 +36,6 @@ gperf, java-common (>= 0.49), javahelper (>= 0.37~), - junit4 (>= 4.8.2-2) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc !sparc64] , kdelibs5-dev (>= 4:4.3.4), libabw-dev (>= 0.1), libarchive-zip-perl, @@ -55,7 +53,6 @@ libcdr-dev (>= 0.1), libclucene-dev (>= 2.3.3.4-4.1), libcmis-dev (>= 0.5.0-3), - libcollada2gltfconvert-dev (>= 20140924-2)[amd64 i386], libcppunit-dev (>= 1.13.2-2.1), libcups2-dev, libcurl4-gnutls-dev, @@ -100,11 +97,9 @@ libmythes-dev (>= 2:1.2), libneon27-gnutls-dev, libnss3-dev (>= 3.12.3), - libo3dgc-dev (>= 0~20131011-2) [amd64 i386], libodfgen-dev (>= 0.1), liborcus-dev (>= 0.11.2), libpagemaker-dev, - libpcre3-dev [amd64 i386], libpng-dev, libpoppler-cpp-dev, libpoppler-dev (>= 0.12.0), @@ -136,11 +131,9 @@ 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, python3, python3-dev (>= 3.3), - rapidjson-dev [amd64 i386], ucpp, unixodbc-dev (>= 2.2.11), unzip, @@ -150,7 +143,6 @@ zlib1g-dev Build-Depends-Indep: doxygen (>= 1.8.4) , fdupes, - g++-mingw-w64-i686, libbase-java [!hppa !ia64 !mips64 !s390 !sparc], libbsh-java, libcommons-logging-java [!mips64], diff -Nru libreoffice-5.2.7/debian/tests/control libreoffice-5.2.7/debian/tests/control --- libreoffice-5.2.7/debian/tests/control 2018-02-22 10:14:18.000000000 +0000 +++ libreoffice-5.2.7/debian/tests/control 2018-03-12 14:27:13.000000000 +0000 @@ -1,5 +1,5 @@ Tests: junit-subsequentcheck -Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) , libpcre3-dev , libcollada2gltfconvert-dev (>= 20140924-2) , rapidjson-dev , libo3dgc-dev (>= 0~20131011-2) , libpoppler-dev (>= 0.12.0), libpoppler-private-dev, libpoppler-cpp-dev , libgraphite2-dev (>= 0.9.3) , libharfbuzz-dev (>= 0.9.18) , libexttextcat-dev (>= 3.4.1) , libjpeg-dev , libxml2-dev, libxml2-utils , libxslt1-dev , libexpat1-dev , unixodbc-dev (>= 2.2.11) , libsane-dev , libpng-dev , libcurl4-gnutls-dev , coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2), coinor-libcoinutils-dev (>= 2.9.15-3.1), libbz2-dev , python3 , python3-dev (>= 3.3) , dh-python , debhelper (>= 9.20160114) , dpkg-dev (>= 1.18.2~) , libcppunit-dev (>= 1.13.2-2.1) , maven-repo-helper , java-common (>= 0.49) , default-jdk , default-jdk (>= 2:1.7-52.1) , default-jdk (>= 2:1.8-55) , ant (>= 1.7.0) , ant-optional (>= 1.7.0) , javahelper (>= 0.37~) , libnss3-dev (>= 3.12.3) , ucpp , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libboost-dev (>= 1.58), libboost-date-time-dev (>= 1.58), libboost-iostreams-dev (>= 1.58), libboost-filesystem-dev (>= 1.58) , libboost-system-dev (>= 1.58) , libmdds-dev (>= 1.2) , liborcus-dev (>= 0.11.2) , libclucene-dev (>= 2.3.3.4-4.1) , librevenge-dev , libwpd-dev (>= 0.10) , libmythes-dev (>= 2:1.2) , libwps-dev (>= 0.4) , libwpg-dev (>= 0.3) , libvisio-dev (>= 0.1) , libcdr-dev (>= 0.1) , libmspub-dev (>= 0.1) , libmwaw-dev (>= 0.3.1) , libodfgen-dev (>= 0.1) , libetonyek-dev , libfreehand-dev (>= 0.1) , libabw-dev (>= 0.1) , libpagemaker-dev , libe-book-dev , libcmis-dev (>= 0.5.0-3) , chromium (>= 39.0.2171.71-1) , libeot-dev , liblcms2-dev , libldap2-dev , liblangtag-dev (>= 0.4) , libicu-dev (>= 52) , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4:4.8) , default-libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.7-4) , libgtk2.0-dev (>= 2.10) , libgtk-3-dev (>= 3.8~) , gobject-introspection (>= 1.32.0), libgirepository1.0-dev (>= 1.32) , libebook1.2-dev , libpq-dev (>= 9.0~) , libxrandr-dev , libhsqldb1.8.0-java (>> 1.8.0.10) , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.70) , libbluetooth-dev , libavahi-client-dev , libgstreamer1.0-dev , libgstreamer-plugins-base1.0-dev , libvlc5 , libneon27-gnutls-dev , librdf0-dev (>= 1.0.16-2) , libglew-dev , libglm-dev (>= 0.9.6.3) , libglib2.0-dev (>= 2.15.0) , gettext , libdconf-dev , make (>= 3.81-8.2), , doxygen (>= 1.8.4) , g++-mingw-w64-i686 , libcommons-logging-java , libbsh-java, build-essential, default-jdk +Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , libpoppler-dev (>= 0.12.0), libpoppler-private-dev, libpoppler-cpp-dev , libgraphite2-dev (>= 0.9.3) , libharfbuzz-dev (>= 0.9.18) , libexttextcat-dev (>= 3.4.1) , libjpeg-dev , libxml2-dev, libxml2-utils , libxslt1-dev , libexpat1-dev , unixodbc-dev (>= 2.2.11) , libsane-dev , libpng-dev , libcurl4-gnutls-dev , coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2), coinor-libcoinutils-dev (>= 2.9.15-3.1), libbz2-dev , python3 , python3-dev (>= 3.3) , dh-python , debhelper (>= 9.20160114) , dpkg-dev (>= 1.18.2~) , libcppunit-dev (>= 1.13.2-2.1) , maven-repo-helper , java-common (>= 0.49) , default-jdk , default-jdk (>= 2:1.7-52.1) , default-jdk (>= 2:1.8-55) , ant (>= 1.7.0) , ant-optional (>= 1.7.0) , javahelper (>= 0.37~) , libnss3-dev (>= 3.12.3) , ucpp , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libboost-dev (>= 1.58), libboost-date-time-dev (>= 1.58), libboost-iostreams-dev (>= 1.58), libboost-filesystem-dev (>= 1.58) , libboost-system-dev (>= 1.58) , libmdds-dev (>= 1.2) , liborcus-dev (>= 0.11.2) , libclucene-dev (>= 2.3.3.4-4.1) , librevenge-dev , libwpd-dev (>= 0.10) , libmythes-dev (>= 2:1.2) , libwps-dev (>= 0.4) , libwpg-dev (>= 0.3) , libvisio-dev (>= 0.1) , libcdr-dev (>= 0.1) , libmspub-dev (>= 0.1) , libmwaw-dev (>= 0.3.1) , libodfgen-dev (>= 0.1) , libetonyek-dev , libfreehand-dev (>= 0.1) , libabw-dev (>= 0.1) , libpagemaker-dev , libe-book-dev , libcmis-dev (>= 0.5.0-3) , libeot-dev , liblcms2-dev , libldap2-dev , liblangtag-dev (>= 0.4) , libicu-dev (>= 52) , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4:4.8) , default-libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.7-4) , libgtk2.0-dev (>= 2.10) , libgtk-3-dev (>= 3.8~) , gobject-introspection (>= 1.32.0), libgirepository1.0-dev (>= 1.32) , libebook1.2-dev , libpq-dev (>= 9.0~) , libxrandr-dev , libhsqldb1.8.0-java (>> 1.8.0.10) , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.70) , libbluetooth-dev , libavahi-client-dev , libgstreamer1.0-dev , libgstreamer-plugins-base1.0-dev , libvlc5 , libneon27-gnutls-dev , librdf0-dev (>= 1.0.16-2) , libglew-dev , libglm-dev (>= 0.9.6.3) , libglib2.0-dev (>= 2.15.0) , gettext , libdconf-dev , make (>= 3.81-8.2), , doxygen (>= 1.8.4) , libcommons-logging-java , libbsh-java, build-essential, default-jdk Tests: pyuno-import Depends: python3-uno