summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-01-10 10:05:31 +0100
committerSlávek Banko <slavek.banko@axis.cz>2020-01-10 10:05:31 +0100
commitf03fe2f1447badd293be7bf028a1839eeaf8dd5f (patch)
treef06459ef7d86ca5d90a93b70d66d1af23e461752 /ubuntu
parent32a046c1e792fe86f0e52834a9755de3830dc8f9 (diff)
downloadtde-packaging-f03fe2f1447badd293be7bf028a1839eeaf8dd5f.tar.gz
tde-packaging-f03fe2f1447badd293be7bf028a1839eeaf8dd5f.zip
DEB tdelibs: Add kamera-trinity (<< 4:14.0.8~) to Conflicts
for tdelibs-data-trinity to ensure smooth upgrade. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/_base/tdelibs/debian/control2
1 files changed, 1 insertions, 1 deletions
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