summaryrefslogtreecommitdiffstats
path: root/debian
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:39 +0200
commit4f14f9e61f767a33f85e7114a2042656598cfa30 (patch)
tree5c3007575d6a485d50f510dcb2894c202cbf0662 /debian
parentc9f1f5014fd8f1be5e5c29fd16baa6a750914dc1 (diff)
downloadtde-packaging-4f14f9e61f767a33f85e7114a2042656598cfa30.tar.gz
tde-packaging-4f14f9e61f767a33f85e7114a2042656598cfa30.zip
DEB tdeaddons: Add kdeartwork-theme-icon-trinity to Conflicts
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'debian')
-rw-r--r--debian/lenny/tdeaddons/debian/control2
-rw-r--r--debian/squeeze/tdeaddons/debian/control2
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/lenny/tdeaddons/debian/control b/debian/lenny/tdeaddons/debian/control
index 7c2444472..58d3fea12 100644
--- a/debian/lenny/tdeaddons/debian/control
+++ b/debian/lenny/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
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