DEB tdeaddons: Move tdeartwork-theme-icon-trinity from Conflicts to Breaks

Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 392da19b27)
8 years ago · 6900db68ba
parent 4750e56554
commit 6900db68ba
3 changed files with 3 additions and 6 deletions
--- a/debian/lenny/tdeaddons/debian/control
+++ b/debian/lenny/tdeaddons/debian/control
@ -127,10 +127,9 @@ Package: kicker-applets-trinity
 Architecture: any
 Section: tde
 Replaces: kicker-applets-trinity (<< 4:14.0.0~)
-Breaks: kicker-applets-trinity (<< 4:14.0.0~)
+Breaks: kicker-applets-trinity (<< 4:14.0.0~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~)
 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
--- a/debian/squeeze/tdeaddons/debian/control
+++ b/debian/squeeze/tdeaddons/debian/control
@ -127,10 +127,9 @@ Package: kicker-applets-trinity
 Architecture: any
 Section: tde
 Replaces: kicker-applets-trinity (<< 4:14.0.0~)
-Breaks: kicker-applets-trinity (<< 4:14.0.0~)
+Breaks: kicker-applets-trinity (<< 4:14.0.0~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~)
 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
--- a/ubuntu/maverick/tdeaddons/debian/control
+++ b/ubuntu/maverick/tdeaddons/debian/control
@ -127,10 +127,9 @@ 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~)
+Breaks: kicker-applets-kde3 (<< 4:14.0.0~), kicker-applets-trinity (<< 4:14.0.0~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~)
 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