summaryrefslogtreecommitdiffstats
path: root/debian/squeeze
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2017-04-09 01:20:39 +0200
committerSlávek Banko <slavek.banko@axis.cz>2017-04-09 01:20:54 +0200
commitb7f7059d07f0db6b652e9684d2afdce8754fdf6b (patch)
tree4c5901fa645b1cde809974c273d79b42b9bb9f63 /debian/squeeze
parentae2d5b2b5a415f53527d5b64a455b449ac638dc5 (diff)
downloadtde-packaging-b7f7059d07f0db6b652e9684d2afdce8754fdf6b.tar.gz
tde-packaging-b7f7059d07f0db6b652e9684d2afdce8754fdf6b.zip
DEB tdeaddons: Add kdeartwork-theme-icon-trinity to Conflicts
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 4f14f9e61f767a33f85e7114a2042656598cfa30)
Diffstat (limited to 'debian/squeeze')
-rw-r--r--debian/squeeze/tdeaddons/debian/control2
1 files changed, 1 insertions, 1 deletions
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