summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/_base/tdelibs/debian/control2
-rw-r--r--ubuntu/_base/tdelibs/debian/control2
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/_base/tdelibs/debian/control b/debian/_base/tdelibs/debian/control
index c9a956401..fab01ea01 100644
--- a/debian/_base/tdelibs/debian/control
+++ b/debian/_base/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~), ksysv-trinity (<< 4:14.0.6~)
+Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~), kamera-trinity (<< 4:14.0.8~)
Depends: hicolor-icon-theme
Provides: tdelibs-data
Description: core shared data for all TDE applications
diff --git a/ubuntu/_base/tdelibs/debian/control b/ubuntu/_base/tdelibs/debian/control
index ab5e5c85f..7c755b672 100644
--- a/ubuntu/_base/tdelibs/debian/control
+++ b/ubuntu/_base/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~), ksysv-trinity (<< 4:14.0.6~)
+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~), kamera-trinity (<< 4:14.0.8~)
Depends: hicolor-icon-theme
Provides: tdelibs-data
Description: core shared data for all TDE applications