summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/lenny/tdelibs/debian/control2
-rw-r--r--debian/squeeze/tdelibs/debian/control2
-rw-r--r--ubuntu/maverick/tdelibs/debian/control2
3 files changed, 3 insertions, 3 deletions
diff --git a/debian/lenny/tdelibs/debian/control b/debian/lenny/tdelibs/debian/control
index 9e41a81c4..c9a956401 100644
--- a/debian/lenny/tdelibs/debian/control
+++ b/debian/lenny/tdelibs/debian/control
@@ -44,7 +44,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:14.0.0~)
+Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~)
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 9e41a81c4..c9a956401 100644
--- a/debian/squeeze/tdelibs/debian/control
+++ b/debian/squeeze/tdelibs/debian/control
@@ -44,7 +44,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:14.0.0~)
+Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~)
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 d2dd12b4b..ab5e5c85f 100644
--- a/ubuntu/maverick/tdelibs/debian/control
+++ b/ubuntu/maverick/tdelibs/debian/control
@@ -45,7 +45,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:14.0.0~), kdebase-kio-plugins-trinity (<= 4:14.0.0~)
+Conflicts: tdelibs-data, kdebase-kio-plugins-kde3 (<= 4:14.0.0~), kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~)
Depends: hicolor-icon-theme
Provides: tdelibs-data
Description: core shared data for all TDE applications