diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2017-04-08 15:01:51 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-04-08 15:02:24 +0200 |
| commit | 6900db68bad5110e1d71d3bdb17ae1bbe5848925 (patch) | |
| tree | c50e56098adec039e8c7b132561fb8286db21af2 | |
| parent | 4750e565541661cf1cc59cd23b49edb49258d5ca (diff) | |
| download | tde-packaging-6900db68bad5110e1d71d3bdb17ae1bbe5848925.tar.gz tde-packaging-6900db68bad5110e1d71d3bdb17ae1bbe5848925.zip | |
DEB tdeaddons: Move tdeartwork-theme-icon-trinity from Conflicts to Breaks
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 392da19b273b40d12988b3d55fea64659af66c6e)
| -rw-r--r-- | debian/lenny/tdeaddons/debian/control | 3 | ||||
| -rw-r--r-- | debian/squeeze/tdeaddons/debian/control | 3 | ||||
| -rw-r--r-- | ubuntu/maverick/tdeaddons/debian/control | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/debian/lenny/tdeaddons/debian/control b/debian/lenny/tdeaddons/debian/control index 7c2444472..307abdd58 100644 --- a/debian/lenny/tdeaddons/debian/control +++ b/debian/lenny/tdeaddons/debian/control @@ -127,10 +127,9 @@ Package: kicker-applets-trinity Architecture: any Section: tde Replaces: kicker-applets-trinity (<< 4:14.0.0~) -Breaks: kicker-applets-trinity (<< 4:14.0.0~) +Breaks: kicker-applets-trinity (<< 4:14.0.0~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~) Depends: ${shlibs:Depends}, kicker-trinity Suggests: xmms-kde-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html -Conflicts: 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..307abdd58 100644 --- a/debian/squeeze/tdeaddons/debian/control +++ b/debian/squeeze/tdeaddons/debian/control @@ -127,10 +127,9 @@ Package: kicker-applets-trinity Architecture: any Section: tde Replaces: kicker-applets-trinity (<< 4:14.0.0~) -Breaks: kicker-applets-trinity (<< 4:14.0.0~) +Breaks: kicker-applets-trinity (<< 4:14.0.0~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~) Depends: ${shlibs:Depends}, kicker-trinity Suggests: xmms-kde-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html -Conflicts: 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..309f9c6df 100644 --- a/ubuntu/maverick/tdeaddons/debian/control +++ b/ubuntu/maverick/tdeaddons/debian/control @@ -127,10 +127,9 @@ Package: kicker-applets-trinity Architecture: any Section: tde Replaces: kicker-applets-kde3 (<< 4:14.0.0~), kicker-applets-trinity (<< 4:14.0.0~) -Breaks: kicker-applets-kde3 (<< 4:14.0.0~), kicker-applets-trinity (<< 4:14.0.0~) +Breaks: kicker-applets-kde3 (<< 4:14.0.0~), kicker-applets-trinity (<< 4:14.0.0~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~) Depends: ${shlibs:Depends}, kicker-trinity Suggests: xmms-kde-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html -Conflicts: tdeartwork-theme-icon-trinity (<< 4:14.0.5~) Provides: ktimemon-trinity Enhances: kicker-trinity Description: applets for Kicker, the Trinity panel |