summaryrefslogtreecommitdiffstats
path: root/debian/lenny
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2017-04-09 01:17:30 +0200
committerSlávek Banko <slavek.banko@axis.cz>2017-04-09 01:17:30 +0200
commit07ba7a2172defc0fac4758a0380c421c58118bc8 (patch)
tree263e0e116cc6db232ba574477c209a25c89e5d38 /debian/lenny
parent6a6adc42e1fee90e1928441e00ee44776a413cb5 (diff)
downloadtde-packaging-07ba7a2172defc0fac4758a0380c421c58118bc8.tar.gz
tde-packaging-07ba7a2172defc0fac4758a0380c421c58118bc8.zip
Revert "DEB tdeaddons: Move tdeartwork-theme-icon-trinity from Conflicts to Breaks"
This reverts commit 392da19b273b40d12988b3d55fea64659af66c6e.
Diffstat (limited to 'debian/lenny')
-rw-r--r--debian/lenny/tdeaddons/debian/control3
1 files changed, 2 insertions, 1 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