7b599145 | 2017-03-07 19:59:20 | Slávek Banko |
DEB tdeartwork: Remove kbabel and kicker-applets from Conflicts This relates to bug 1282 Signed-off-by: Slávek Banko <slavek.banko@...> |
||
M debian/lenny/tdeartwork/debian/control M debian/squeeze/tdeartwork/debian/control M ubuntu/maverick/tdeartwork/debian/control |
||
diff --git a/debian/lenny/tdeartwork/debian/control b/debian/lenny/tdeartwork/debian/control index 250c520..9cc49c2 100644 --- a/debian/lenny/tdeartwork/debian/control +++ b/debian/lenny/tdeartwork/debian/control @@ -75,7 +75,6 @@ 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 Depends: ${misc:Depends} Description: icon themes released with Trinity diff --git a/debian/squeeze/tdeartwork/debian/control b/debian/squeeze/tdeartwork/debian/control index 250c520..9cc49c2 100644 --- a/debian/squeeze/tdeartwork/debian/control +++ b/debian/squeeze/tdeartwork/debian/control @@ -75,7 +75,6 @@ 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 Depends: ${misc:Depends} Description: icon themes released with Trinity diff --git a/ubuntu/maverick/tdeartwork/debian/control b/ubuntu/maverick/tdeartwork/debian/control index 577973f..94fb221 100644 --- a/ubuntu/maverick/tdeartwork/debian/control +++ b/ubuntu/maverick/tdeartwork/debian/control @@ -75,7 +75,6 @@ Section: tde Replaces: kdeartwork-theme-icon-kde3 (<< 4:14.0.0~), kdeartwork-theme-icon-trinity (<< 4:14.0.0~) Breaks: kdeartwork-theme-icon-kde3 (<< 4:14.0.0~), 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 Depends: ${misc:Depends} Description: icon themes released with Trinity |