diff -Nru libreoffice-6.3.2/debian/changelog libreoffice-6.3.2/debian/changelog --- libreoffice-6.3.2/debian/changelog 2019-09-26 14:17:34.000000000 +0000 +++ libreoffice-6.3.2/debian/changelog 2019-10-03 20:31:21.000000000 +0000 @@ -1,3 +1,10 @@ +libreoffice (1:6.3.2-0ubuntu2) eoan; urgency=medium + + * libreoffice-style-sifr should not conflict with the libreoffice-style-hicontrast + transitional package (LP: #1846555) + + -- Marcus Tomlinson Thu, 03 Oct 2019 21:31:21 +0100 + libreoffice (1:6.3.2-0ubuntu1) eoan; urgency=medium * New upstream release diff -Nru libreoffice-6.3.2/debian/control libreoffice-6.3.2/debian/control --- libreoffice-6.3.2/debian/control 2019-09-26 14:17:34.000000000 +0000 +++ libreoffice-6.3.2/debian/control 2019-10-03 20:31:21.000000000 +0000 @@ -590,9 +590,9 @@ Architecture: all Enhances: libreoffice-core Depends: libreoffice-style-breeze, ${misc:Depends} -Provides: libreoffice-style, libreoffice-style-hicontrast -Replaces: libreoffice-style-hicontrast -Conflicts: libreoffice-style-hicontrast +Provides: libreoffice-style, libreoffice-style-hicontrast (= ${binary:Version}) +Replaces: libreoffice-style-hicontrast (<< ${binary:Version}) +Breaks: libreoffice-style-hicontrast (<< ${binary:Version}) Description: office productivity suite -- Sifr symbol style LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. diff -Nru libreoffice-6.3.2/debian/control.in libreoffice-6.3.2/debian/control.in --- libreoffice-6.3.2/debian/control.in 2019-09-12 14:05:28.000000000 +0000 +++ libreoffice-6.3.2/debian/control.in 2019-10-03 20:30:59.000000000 +0000 @@ -408,9 +408,9 @@ Architecture: all Enhances: libreoffice-core Depends: libreoffice-style-breeze, ${misc:Depends} -Provides: libreoffice-style, libreoffice-style-hicontrast -Replaces: libreoffice-style-hicontrast -Conflicts: libreoffice-style-hicontrast +Provides: libreoffice-style, libreoffice-style-hicontrast (= ${binary:Version}) +Replaces: libreoffice-style-hicontrast (<< ${binary:Version}) +Breaks: libreoffice-style-hicontrast (<< ${binary:Version}) Description: office productivity suite -- Sifr symbol style LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. diff -Nru libreoffice-6.3.2/debian/rules libreoffice-6.3.2/debian/rules --- libreoffice-6.3.2/debian/rules 2019-09-26 14:17:34.000000000 +0000 +++ libreoffice-6.3.2/debian/rules 2019-09-26 15:44:54.000000000 +0000 @@ -63,7 +63,7 @@ TARFILE_LOCATION=$(CURDIR)/tarballs export TARFILE_LOCATION USE_SOURCE_TARBALLS=n -USE_GIT_TARBALLS=y +USE_GIT_TARBALLS=n ifeq "$(USE_GIT_TARBALLS)" "y" GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice # bootstraping this from the source tree is breaking get-orig-source