From 8326890c2f94ef3cb4c83d45d37f618314bf319e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 17 Nov 2018 15:40:37 +0100 Subject: DEB tdebase: Add kdf-trinity (<< 4:14.0.6~) to Conflicts for tdebase-data-trinity to ensure smooth upgrade. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 16f63a6530be7a18fc452f1aeec2a21310bf0a22) --- ubuntu/maverick/tdebase/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ubuntu/maverick') diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control index 105754902..fc69deacd 100644 --- a/ubuntu/maverick/tdebase/debian/control +++ b/ubuntu/maverick/tdebase/debian/control @@ -126,7 +126,7 @@ Section: tde Architecture: all Replaces: kdebase-data-kde3 (<< 4:14.0.0~), kdebase-data-trinity (<< 4:14.0.0~) Breaks: kdebase-data-kde3 (<< 4:14.0.0~), kdebase-data-trinity (<< 4:14.0.0~) -Conflicts: kcontrol-trinity (<< 4:3.4.2-1), twin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1) +Conflicts: kcontrol-trinity (<< 4:3.4.2-1), twin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1), kdf-trinity (<< 4:14.0.6~) Description: shared data files for the TDE base module This package contains the architecture-independent shared data files needed for a basic Trinity desktop installation. -- cgit v1.2.1