summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2017-04-09 01:18:17 +0200
committerSlávek Banko <slavek.banko@axis.cz>2017-04-09 01:18:17 +0200
commitadd6f7daeb73021b5842eee36242d5ff4c9ab0db (patch)
treedcb0a402355f5d2142e82e44d5bc319de8f7b377 /ubuntu
parentfbc56dc936f26e2a2ff6b0dfbcba3b670821c72f (diff)
downloadtde-packaging-add6f7daeb73021b5842eee36242d5ff4c9ab0db.tar.gz
tde-packaging-add6f7daeb73021b5842eee36242d5ff4c9ab0db.zip
Revert "DEB tdeaddons: Move tdeartwork-theme-icon-trinity from Conflicts to Breaks"
This reverts commit 6900db68bad5110e1d71d3bdb17ae1bbe5848925.
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/maverick/tdeaddons/debian/control3
1 files changed, 2 insertions, 1 deletions
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