diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2017-04-09 01:20:39 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-04-09 01:20:54 +0200 |
| commit | b7f7059d07f0db6b652e9684d2afdce8754fdf6b (patch) | |
| tree | 4c5901fa645b1cde809974c273d79b42b9bb9f63 | |
| parent | ae2d5b2b5a415f53527d5b64a455b449ac638dc5 (diff) | |
| download | tde-packaging-b7f7059d07f0db6b652e9684d2afdce8754fdf6b.tar.gz tde-packaging-b7f7059d07f0db6b652e9684d2afdce8754fdf6b.zip | |
DEB tdeaddons: Add kdeartwork-theme-icon-trinity to Conflicts
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4f14f9e61f767a33f85e7114a2042656598cfa30)
| -rw-r--r-- | debian/lenny/tdeaddons/debian/control | 2 | ||||
| -rw-r--r-- | debian/squeeze/tdeaddons/debian/control | 2 | ||||
| -rw-r--r-- | ubuntu/maverick/tdeaddons/debian/control | 2 |
3 files changed, 3 insertions, 3 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 diff --git a/ubuntu/maverick/tdeaddons/debian/control b/ubuntu/maverick/tdeaddons/debian/control index 62085d825..c2f7b2808 100644 --- a/ubuntu/maverick/tdeaddons/debian/control +++ b/ubuntu/maverick/tdeaddons/debian/control @@ -130,7 +130,7 @@ Replaces: kicker-applets-kde3 (<< 4:14.0.0~), kicker-applets-trinity (<< 4:14.0. Breaks: kicker-applets-kde3 (<< 4:14.0.0~), 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 |