diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2017-04-09 01:18:17 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-04-09 01:18:17 +0200 |
| commit | add6f7daeb73021b5842eee36242d5ff4c9ab0db (patch) | |
| tree | dcb0a402355f5d2142e82e44d5bc319de8f7b377 | |
| parent | fbc56dc936f26e2a2ff6b0dfbcba3b670821c72f (diff) | |
| download | tde-packaging-add6f7daeb73021b5842eee36242d5ff4c9ab0db.tar.gz tde-packaging-add6f7daeb73021b5842eee36242d5ff4c9ab0db.zip | |
Revert "DEB tdeaddons: Move tdeartwork-theme-icon-trinity from Conflicts to Breaks"
This reverts commit 6900db68bad5110e1d71d3bdb17ae1bbe5848925.
| -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, 6 insertions, 3 deletions
diff --git a/debian/lenny/tdeaddons/debian/control b/debian/lenny/tdeaddons/debian/control index 307abdd58..7c2444472 100644 --- a/debian/lenny/tdeaddons/debian/control +++ b/debian/lenny/tdeaddons/debian/control @@ -127,9 +127,10 @@ Package: kicker-applets-trinity Architecture: any Section: tde Replaces: kicker-applets-trinity (<< 4:14.0.0~) -Breaks: kicker-applets-trinity (<< 4:14.0.0~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~) +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~) 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 307abdd58..7c2444472 100644 --- a/debian/squeeze/tdeaddons/debian/control +++ b/debian/squeeze/tdeaddons/debian/control @@ -127,9 +127,10 @@ Package: kicker-applets-trinity Architecture: any Section: tde Replaces: kicker-applets-trinity (<< 4:14.0.0~) -Breaks: kicker-applets-trinity (<< 4:14.0.0~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~) +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~) 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 309f9c6df..62085d825 100644 --- a/ubuntu/maverick/tdeaddons/debian/control +++ b/ubuntu/maverick/tdeaddons/debian/control @@ -127,9 +127,10 @@ 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~), tdeartwork-theme-icon-trinity (<< 4:14.0.5~) +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~) Provides: ktimemon-trinity Enhances: kicker-trinity Description: applets for Kicker, the Trinity panel |