diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2014-11-17 13:00:22 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-11-17 13:00:22 +0100 |
| commit | eec4bd7f0ae3a73335b11275168c25e7a3185524 (patch) | |
| tree | 199b816beb8edcfbf55c1de966a6eb594542473a | |
| parent | 7d7ecccf35dc70e6d1c04bc006f3a368d7c24901 (diff) | |
| download | tde-packaging-eec4bd7f0ae3a73335b11275168c25e7a3185524.tar.gz tde-packaging-eec4bd7f0ae3a73335b11275168c25e7a3185524.zip | |
Add kdebase-kio-plugins to Conflicts for tdelibs-data on Debian and Ubuntu
This will allow smooth upgrade after moving LUKS icons to tdelibs
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
| -rw-r--r-- | debian/lenny/tdelibs/debian/control | 1 | ||||
| -rw-r--r-- | debian/squeeze/tdelibs/debian/control | 1 | ||||
| -rw-r--r-- | ubuntu/maverick/tdelibs/debian/control | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/debian/lenny/tdelibs/debian/control b/debian/lenny/tdelibs/debian/control index 8d9a4b0cd..e5a3ec6ce 100644 --- a/debian/lenny/tdelibs/debian/control +++ b/debian/lenny/tdelibs/debian/control @@ -43,6 +43,7 @@ Section: libs Architecture: all Replaces: kdelibs-data-trinity (<< 4:14.0.0~) Breaks: kdelibs-data-trinity (<< 4:14.0.0~) +Conflicts: kdebase-kio-plugins-trinity (<= 4:3.5.13.2) Depends: hicolor-icon-theme Provides: tdelibs-data Description: core shared data for all TDE applications diff --git a/debian/squeeze/tdelibs/debian/control b/debian/squeeze/tdelibs/debian/control index 8d9a4b0cd..e5a3ec6ce 100644 --- a/debian/squeeze/tdelibs/debian/control +++ b/debian/squeeze/tdelibs/debian/control @@ -43,6 +43,7 @@ Section: libs Architecture: all Replaces: kdelibs-data-trinity (<< 4:14.0.0~) Breaks: kdelibs-data-trinity (<< 4:14.0.0~) +Conflicts: kdebase-kio-plugins-trinity (<= 4:3.5.13.2) Depends: hicolor-icon-theme Provides: tdelibs-data Description: core shared data for all TDE applications diff --git a/ubuntu/maverick/tdelibs/debian/control b/ubuntu/maverick/tdelibs/debian/control index 182174583..32c1e5290 100644 --- a/ubuntu/maverick/tdelibs/debian/control +++ b/ubuntu/maverick/tdelibs/debian/control @@ -44,6 +44,7 @@ Section: libs Architecture: all Replaces: kdelibs-data-kde3 (<< 4:14.0.0~), kdelibs-data-trinity (<< 4:14.0.0~) Breaks: kdelibs-data-kde3 (<< 4:14.0.0~), kdelibs-data-trinity (<< 4:14.0.0~) +Conflicts: kdebase-kio-plugins-kde3 (<= 4:3.5.13.2), kdebase-kio-plugins-trinity (<= 4:3.5.13.2) Depends: hicolor-icon-theme Provides: tdelibs-data Conflicts: tdelibs-data |