From ef7d58f7a18b7d75b1c408be4bfd1b6cc2abc88a Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Thu, 19 Oct 2023 09:42:24 +0200 Subject: [PATCH] Don't conflict with apparmor (<< 2.13.1~) to ease dist-upgrade from bionic (LP: #2032852) --- changelog | 7 +++++++ control | 2 +- rules | 2 -- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/changelog b/changelog index 1f5d2c8af..83dcbcbdd 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,10 @@ +libreoffice (1:6.4.7-0ubuntu0.20.04.9) UNRELEASED; urgency=medium + + * Don't conflict with apparmor (<< 2.13.1~) to ease dist-upgrade + from bionic (LP: #2032852) + + -- Rico Tzschichholz Thu, 19 Oct 2023 09:36:27 +0200 + libreoffice (1:6.4.7-0ubuntu0.20.04.8) focal-security; urgency=high * SECURITY UPDATE: Remote documents loaded without prompt via IFrame diff --git a/control b/control index c7ccc0cf9..167145f2e 100644 --- a/control +++ b/control @@ -444,7 +444,7 @@ Conflicts: broffice, libreoffice-l10n-4.3, libreoffice-l10n-4.4, libreoffice-wiki-publisher (<< 1.2.0+LibO5.4.0~rc2), - openoffice-unbundled, apparmor (<< 2.13.1~) + openoffice-unbundled Provides: libreoffice-l10n-en-us Breaks: libreoffice-base (<< 1:6.4.0~beta1-2~), libreoffice-core (<< 1:${oover}~), diff --git a/rules b/rules index 9e4c2752e..b37de5e9e 100755 --- a/rules +++ b/rules @@ -1813,8 +1813,6 @@ endif ifeq "$(ENABLE_APPARMOR_PROFILES)" "y" perl -pi -e 's/ttf-mscorefonts-installer/ttf-mscorefonts-installer, apparmor (>= 2.13.1~)/' debian/control - perl -pi -e 's/openoffice-unbundled/openoffice-unbundled, apparmor (<< 2.13.1~)/' debian/control - endif .DELETE_ON_ERROR: debian/control -- 2.40.1