summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-04-28 16:56:25 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-04-28 17:17:59 +0200
commita07f60dccc6cae7db244a1ebb68a205e30889c82 (patch)
tree3697e3c6e0afeea3025e256233924ffdcd149b31 /debian
parent956b3f9170f4d349bd49c985e40b2e714534dad2 (diff)
downloadtde-packaging-a07f60dccc6cae7db244a1ebb68a205e30889c82.tar.gz
tde-packaging-a07f60dccc6cae7db244a1ebb68a205e30889c82.zip
Add kbabel and kicker-applets to Conflicts for tdeartwork on Debian and Ubuntu
This relates to Bug 1282
Diffstat (limited to 'debian')
-rw-r--r--debian/lenny/tdeartwork/debian/control1
-rw-r--r--debian/squeeze/tdeartwork/debian/control1
-rw-r--r--debian/wheezy/tdeartwork/debian/control1
3 files changed, 3 insertions, 0 deletions
diff --git a/debian/lenny/tdeartwork/debian/control b/debian/lenny/tdeartwork/debian/control
index d01eac73b..56a6ec0d3 100644
--- a/debian/lenny/tdeartwork/debian/control
+++ b/debian/lenny/tdeartwork/debian/control
@@ -73,6 +73,7 @@ Architecture: all
Section: tde
Replaces: kdeartwork-theme-icon-trinity (<< 4:14.0.0)
Breaks: kdeartwork-theme-icon-trinity (<< 4:14.0.0)
+Conflicts: kbabel-trinity (<< 4:3.5.13.2~), kicker-applets-trinity (<< 4:3.5.13.2~)
Recommends: kdesktop-trinity, kicker-trinity
Description: icon themes released with Trinity
This package contains additional icon themes for Trinity. Icon themes can be
diff --git a/debian/squeeze/tdeartwork/debian/control b/debian/squeeze/tdeartwork/debian/control
index d01eac73b..56a6ec0d3 100644
--- a/debian/squeeze/tdeartwork/debian/control
+++ b/debian/squeeze/tdeartwork/debian/control
@@ -73,6 +73,7 @@ Architecture: all
Section: tde
Replaces: kdeartwork-theme-icon-trinity (<< 4:14.0.0)
Breaks: kdeartwork-theme-icon-trinity (<< 4:14.0.0)
+Conflicts: kbabel-trinity (<< 4:3.5.13.2~), kicker-applets-trinity (<< 4:3.5.13.2~)
Recommends: kdesktop-trinity, kicker-trinity
Description: icon themes released with Trinity
This package contains additional icon themes for Trinity. Icon themes can be
diff --git a/debian/wheezy/tdeartwork/debian/control b/debian/wheezy/tdeartwork/debian/control
index d01eac73b..56a6ec0d3 100644
--- a/debian/wheezy/tdeartwork/debian/control
+++ b/debian/wheezy/tdeartwork/debian/control
@@ -73,6 +73,7 @@ Architecture: all
Section: tde
Replaces: kdeartwork-theme-icon-trinity (<< 4:14.0.0)
Breaks: kdeartwork-theme-icon-trinity (<< 4:14.0.0)
+Conflicts: kbabel-trinity (<< 4:3.5.13.2~), kicker-applets-trinity (<< 4:3.5.13.2~)
Recommends: kdesktop-trinity, kicker-trinity
Description: icon themes released with Trinity
This package contains additional icon themes for Trinity. Icon themes can be