summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2017-04-08 15:01:51 +0200
committerSlávek Banko <slavek.banko@axis.cz>2017-04-08 15:01:51 +0200
commit392da19b273b40d12988b3d55fea64659af66c6e (patch)
treee18755e480f2d25b7893a94e41ee206afa10ed9b /debian
parentf3bc4668b45c658fa8f09677e4c45e09e9769170 (diff)
downloadtde-packaging-392da19b273b40d12988b3d55fea64659af66c6e.tar.gz
tde-packaging-392da19b273b40d12988b3d55fea64659af66c6e.zip
DEB tdeaddons: Move tdeartwork-theme-icon-trinity from Conflicts to Breaks
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'debian')
-rw-r--r--debian/lenny/tdeaddons/debian/control3
-rw-r--r--debian/squeeze/tdeaddons/debian/control3
2 files changed, 2 insertions, 4 deletions
diff --git a/debian/lenny/tdeaddons/debian/control b/debian/lenny/tdeaddons/debian/control
index 7c2444472..307abdd58 100644
--- 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
diff --git a/debian/squeeze/tdeaddons/debian/control b/debian/squeeze/tdeaddons/debian/control
index 7c2444472..307abdd58 100644
--- 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