From 07ba7a2172defc0fac4758a0380c421c58118bc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 9 Apr 2017 01:17:30 +0200 Subject: [PATCH] Revert "DEB tdeaddons: Move tdeartwork-theme-icon-trinity from Conflicts to Breaks" This reverts commit 392da19b273b40d12988b3d55fea64659af66c6e. --- debian/lenny/tdeaddons/debian/control | 3 ++- debian/squeeze/tdeaddons/debian/control | 3 ++- ubuntu/maverick/tdeaddons/debian/control | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/lenny/tdeaddons/debian/control b/debian/lenny/tdeaddons/debian/control index 307abdd58..7c2444472 100644 --- a/debian/lenny/tdeaddons/debian/control +++ b/debian/lenny/tdeaddons/debian/control @@ -127,9 +127,10 @@ Package: kicker-applets-trinity Architecture: any Section: tde Replaces: kicker-applets-trinity (<< 4:14.0.0~) -Breaks: kicker-applets-trinity (<< 4:14.0.0~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~) +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~) 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 307abdd58..7c2444472 100644 --- a/debian/squeeze/tdeaddons/debian/control +++ b/debian/squeeze/tdeaddons/debian/control @@ -127,9 +127,10 @@ Package: kicker-applets-trinity Architecture: any Section: tde Replaces: kicker-applets-trinity (<< 4:14.0.0~) -Breaks: kicker-applets-trinity (<< 4:14.0.0~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~) +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~) 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 309f9c6df..62085d825 100644 --- a/ubuntu/maverick/tdeaddons/debian/control +++ b/ubuntu/maverick/tdeaddons/debian/control @@ -127,9 +127,10 @@ Package: kicker-applets-trinity Architecture: any Section: tde Replaces: kicker-applets-kde3 (<< 4:14.0.0~), kicker-applets-trinity (<< 4:14.0.0~) -Breaks: kicker-applets-kde3 (<< 4:14.0.0~), kicker-applets-trinity (<< 4:14.0.0~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~) +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~) Provides: ktimemon-trinity Enhances: kicker-trinity Description: applets for Kicker, the Trinity panel