From 8f36ed71b8d5896a343f83f12a6fe3b1cd073d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 22 Jun 2016 23:23:43 +0200 Subject: Add conflicts kubuntu-settings-desktop for default settings packages on Ubuntu 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 54337e78cd7c84fab08c2e3f4bf69394a0d381b8) --- ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian') diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/control b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/control index 2d3fd59d9..257e75ae3 100644 --- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/control +++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.8.4 Package: kubuntu-default-settings-trinity Architecture: all Depends: crystalcursors -Conflicts: kubuntu-default-settings +Conflicts: kubuntu-default-settings, kubuntu-settings-desktop Recommends: tdmtheme-trinity, kubuntu-tdm-themes Description: Default settings and artwork for the Ubuntu Trinity desktop This package contains the default settings used by Ubuntu [Trinity]. It also -- cgit v1.2.1