summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-12-25 18:31:15 +0100
committerSlávek Banko <slavek.banko@axis.cz>2014-12-25 19:00:46 +0100
commit19215f8229ac06a0b2170572f8bfc0db572351f2 (patch)
tree356e6ccdfc743022f2713d0a6b3a5eb2fc606d75 /debian
parentc66f10205c8a4cc9043e7e0abd67a5aa6d9e429b (diff)
downloadtde-packaging-19215f8229ac06a0b2170572f8bfc0db572351f2.tar.gz
tde-packaging-19215f8229ac06a0b2170572f8bfc0db572351f2.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> (cherry picked from commit d528497c48f4af95d15fa0b0027aaaf1d283ad1a)
Diffstat (limited to 'debian')
-rw-r--r--debian/lenny/tdelibs/debian/control2
-rw-r--r--debian/squeeze/tdelibs/debian/control2
2 files changed, 2 insertions, 2 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