diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2017-03-08 02:59:20 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-03-08 02:59:36 +0100 |
| commit | 1f54f40d28164b266adf3ee1edec537cc205af96 (patch) | |
| tree | a61260e99c51f6e28ddde753efc8964850f56592 | |
| parent | 6a4d740eea85a9438cb4763e37eec925574d532e (diff) | |
| download | tde-packaging-1f54f40d28164b266adf3ee1edec537cc205af96.tar.gz tde-packaging-1f54f40d28164b266adf3ee1edec537cc205af96.zip | |
DEB tdeartwork: Remove kbabel and kicker-applets from Conflicts
This relates to bug 1282
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 7b599145e99fdb4ce9d7dc1f9dd9a0bb02d27ae6)
| -rw-r--r-- | debian/lenny/tdeartwork/debian/control | 1 | ||||
| -rw-r--r-- | debian/squeeze/tdeartwork/debian/control | 1 | ||||
| -rw-r--r-- | ubuntu/maverick/tdeartwork/debian/control | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/debian/lenny/tdeartwork/debian/control b/debian/lenny/tdeartwork/debian/control index 250c52093..9cc49c26e 100644 --- a/debian/lenny/tdeartwork/debian/control +++ b/debian/lenny/tdeartwork/debian/control @@ -75,7 +75,6 @@ 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 Depends: ${misc:Depends} Description: icon themes released with Trinity diff --git a/debian/squeeze/tdeartwork/debian/control b/debian/squeeze/tdeartwork/debian/control index 250c52093..9cc49c26e 100644 --- a/debian/squeeze/tdeartwork/debian/control +++ b/debian/squeeze/tdeartwork/debian/control @@ -75,7 +75,6 @@ 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 Depends: ${misc:Depends} Description: icon themes released with Trinity diff --git a/ubuntu/maverick/tdeartwork/debian/control b/ubuntu/maverick/tdeartwork/debian/control index 577973f4e..94fb2216e 100644 --- a/ubuntu/maverick/tdeartwork/debian/control +++ b/ubuntu/maverick/tdeartwork/debian/control @@ -75,7 +75,6 @@ Architecture: all 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 |