Bug#1000730: Merge conflict marker left in Debian changelog
Package: libreoffice
Version: 1:7.2.3-1
Severity: normal
X-Debbugs-Cc: josh@joshtriplett.org
The Debian changelog for libreoffice contains what looks like a merge
conflict marker around the entry for 1:7.3.0~alpha1-2:
libreoffice (1:7.3.0~alpha1-2) experimental; urgency=medium
* debian/rules:
- use --without-cppunit in build-indep
- use clang 12 on ppc64el (if building with LTO at least)
- fix autopkgtest builds; explicitely set PACKAGE_SDK_DOCS=n
-- Rene Engelhard <rene@debian.org> Sun, 31 Oct 2021 09:25:30 +0100
>>>>>>> efaacb77 (actually only set TEST_TIMEOUT if we ignore the test results anyway...)
* debian/control*.in: also apply 1:7.2.1-2/-3 changes for
libreoffice-core-nogui...
-- Rene Engelhard <rene@debian.org> Thu, 18 Nov 2021 18:50:36 +0100
libreoffice (1:7.2.2-1) unstable; urgency=medium
Reply to: