From b7f7059d07f0db6b652e9684d2afdce8754fdf6b Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Sun, 9 Apr 2017 01:20:39 +0200 Subject: DEB tdeaddons: Add kdeartwork-theme-icon-trinity to Conflicts 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 4f14f9e61f767a33f85e7114a2042656598cfa30) --- debian/lenny/tdeaddons/debian/control | 2 +- debian/squeeze/tdeaddons/debian/control | 2 +- ubuntu/maverick/tdeaddons/debian/control | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/lenny/tdeaddons/debian/control b/debian/lenny/tdeaddons/debian/control index 7c2444472..58d3fea12 100644 --- a/debian/lenny/tdeaddons/debian/control +++ b/debian/lenny/tdeaddons/debian/control @@ -130,7 +130,7 @@ Replaces: kicker-applets-trinity (<< 4:14.0.0~) Breaks: kicker-applets-trinity (<< 4:14.0.0~) Depends: ${shlibs:Depends}, kicker-trinity Suggests: xmms-kde-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html -Conflicts: tdeartwork-theme-icon-trinity (<< 4:14.0.5~) +Conflicts: kdeartwork-theme-icon-trinity (<< 4:3.5.13.3~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~) Provides: ktimemon-trinity Enhances: kicker-trinity Description: applets for Kicker, the Trinity panel diff --git a/debian/squeeze/tdeaddons/debian/control b/debian/squeeze/tdeaddons/debian/control index 7c2444472..58d3fea12 100644 --- a/debian/squeeze/tdeaddons/debian/control +++ b/debian/squeeze/tdeaddons/debian/control @@ -130,7 +130,7 @@ Replaces: kicker-applets-trinity (<< 4:14.0.0~) Breaks: kicker-applets-trinity (<< 4:14.0.0~) Depends: ${shlibs:Depends}, kicker-trinity Suggests: xmms-kde-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html -Conflicts: tdeartwork-theme-icon-trinity (<< 4:14.0.5~) +Conflicts: kdeartwork-theme-icon-trinity (<< 4:3.5.13.3~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~) Provides: ktimemon-trinity Enhances: kicker-trinity Description: applets for Kicker, the Trinity panel diff --git a/ubuntu/maverick/tdeaddons/debian/control b/ubuntu/maverick/tdeaddons/debian/control index 62085d825..c2f7b2808 100644 --- a/ubuntu/maverick/tdeaddons/debian/control +++ b/ubuntu/maverick/tdeaddons/debian/control @@ -130,7 +130,7 @@ Replaces: kicker-applets-kde3 (<< 4:14.0.0~), kicker-applets-trinity (<< 4:14.0. Breaks: kicker-applets-kde3 (<< 4:14.0.0~), kicker-applets-trinity (<< 4:14.0.0~) Depends: ${shlibs:Depends}, kicker-trinity Suggests: xmms-kde-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html -Conflicts: tdeartwork-theme-icon-trinity (<< 4:14.0.5~) +Conflicts: kdeartwork-theme-icon-trinity (<< 4:3.5.13.3~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~) Provides: ktimemon-trinity Enhances: kicker-trinity Description: applets for Kicker, the Trinity panel -- cgit v1.2.3