diff -Nru libreoffice-6.2.4/debian/changelog libreoffice-6.2.4/debian/changelog --- libreoffice-6.2.4/debian/changelog 2019-05-23 08:17:07.000000000 +0000 +++ libreoffice-6.2.4/debian/changelog 2019-06-17 12:18:01.000000000 +0000 @@ -1,4 +1,11 @@ -libreoffice (1:6.2.4-0ubuntu2~ppa3) eoan; urgency=medium +libreoffice (1:6.2.4-0ubuntu2) eoan; urgency=medium + + * debian/patches/fix-flaky-bridgetest.diff: add safer float comparisons to + bridgetest equals() (LP: 1832360) + + -- Marcus Tomlinson Mon, 17 Jun 2019 13:18:01 +0100 + +libreoffice (1:6.2.4-0ubuntu1) eoan; urgency=medium * New upstream release diff -Nru libreoffice-6.2.4/debian/control libreoffice-6.2.4/debian/control --- libreoffice-6.2.4/debian/control 2019-05-23 08:17:07.000000000 +0000 +++ libreoffice-6.2.4/debian/control 2019-06-17 12:18:01.000000000 +0000 @@ -183,7 +183,7 @@ Standards-Version: 4.0.1 Vcs-Git: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice -b ubuntu-disco-6.2 Vcs-Browser: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice -Bugs: mailto:libreoffice@lists.launchpad.net +Bugs: Homepage: http://www.libreoffice.org Package: libreoffice diff -Nru libreoffice-6.2.4/debian/patches/fix-flaky-bridgetest.diff libreoffice-6.2.4/debian/patches/fix-flaky-bridgetest.diff --- libreoffice-6.2.4/debian/patches/fix-flaky-bridgetest.diff 2019-05-23 08:17:07.000000000 +0000 +++ libreoffice-6.2.4/debian/patches/fix-flaky-bridgetest.diff 2019-06-17 12:18:01.000000000 +0000 @@ -4,7 +4,15 @@ --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx -@@ -124,6 +124,9 @@ public: +@@ -53,6 +53,7 @@ + #include "currentcontextchecker.hxx" + #include "multi.hxx" + #include ++#include + + using namespace osl; + using namespace cppu; +@@ -124,6 +125,9 @@ public: static bool equals( const TestElement & rData1, const TestElement & rData2 ) { @@ -14,7 +22,7 @@ check( rData1.Bool == rData2.Bool, "### bool does not match!" ); check( rData1.Char == rData2.Char, "### char does not match!" ); check( rData1.Byte == rData2.Byte, "### byte does not match!" ); -@@ -133,8 +136,8 @@ static bool equals( const TestElement & rData1, const TestElement & rData2 ) +@@ -133,8 +137,8 @@ static bool equals( const TestElement & rData1, const TestElement & rData2 ) check( rData1.ULong == rData2.ULong, "### unsigned long does not match!" ); check( rData1.Hyper == rData2.Hyper, "### hyper does not match!" ); check( rData1.UHyper == rData2.UHyper, "### unsigned hyper does not match!" ); @@ -25,7 +33,7 @@ check( rData1.Enum == rData2.Enum, "### enum does not match!" ); check( rData1.String == rData2.String, "### string does not match!" ); check( rData1.Interface == rData2.Interface, "### interface does not match!" ); -@@ -149,8 +152,8 @@ static bool equals( const TestElement & rData1, const TestElement & rData2 ) +@@ -149,8 +153,8 @@ static bool equals( const TestElement & rData1, const TestElement & rData2 ) rData1.ULong == rData2.ULong && rData1.Hyper == rData2.Hyper && rData1.UHyper == rData2.UHyper && diff -Nru libreoffice-6.2.4/debian/patches/series libreoffice-6.2.4/debian/patches/series --- libreoffice-6.2.4/debian/patches/series 2019-05-23 08:17:07.000000000 +0000 +++ libreoffice-6.2.4/debian/patches/series 2019-06-17 12:15:56.000000000 +0000 @@ -40,4 +40,4 @@ hide-startcenter-desktop-file.patch mysql-80-compatibility.patch fix-uicheck-tests-on-i386.patch -fix-flaky-bridgetest.diff \ No newline at end of file +fix-flaky-bridgetest.diff