diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2014-12-25 18:31:15 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-12-25 18:48:15 +0100 |
| commit | d528497c48f4af95d15fa0b0027aaaf1d283ad1a (patch) | |
| tree | 5e793408d9e75f9c8f1ac7dbba2acf5f33854dce | |
| parent | 430c48787e46116f09139ae549ffe8e60ba1f89d (diff) | |
| download | tde-packaging-d528497c48f4af95d15fa0b0027aaaf1d283ad1a.tar.gz tde-packaging-d528497c48f4af95d15fa0b0027aaaf1d283ad1a.zip | |
Update kdebase-kio-plugins version in Conflicts for tdelibs-data on Debian and Ubuntu
to allow smooth upgrade by apt-get
This resolves Bug 2245
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
| -rw-r--r-- | debian/lenny/tdelibs/debian/control | 2 | ||||
| -rw-r--r-- | debian/squeeze/tdelibs/debian/control | 2 | ||||
| -rw-r--r-- | ubuntu/maverick/tdelibs/debian/control | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/debian/lenny/tdelibs/debian/control b/debian/lenny/tdelibs/debian/control index e5a3ec6ce..68394e08d 100644 --- a/debian/lenny/tdelibs/debian/control +++ b/debian/lenny/tdelibs/debian/control @@ -43,7 +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) +Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~) 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 e5a3ec6ce..68394e08d 100644 --- a/debian/squeeze/tdelibs/debian/control +++ b/debian/squeeze/tdelibs/debian/control @@ -43,7 +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) +Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~) 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 85867e617..9289c4e72 100644 --- a/ubuntu/maverick/tdelibs/debian/control +++ b/ubuntu/maverick/tdelibs/debian/control @@ -44,7 +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: tdelibs-data, kdebase-kio-plugins-kde3 (<= 4:3.5.13.2), kdebase-kio-plugins-trinity (<= 4:3.5.13.2) +Conflicts: tdelibs-data, kdebase-kio-plugins-kde3 (<= 4:14.0.0~), kdebase-kio-plugins-trinity (<= 4:14.0.0~) Depends: hicolor-icon-theme Provides: tdelibs-data Description: core shared data for all TDE applications |