summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base
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:06:38 +0100
commit0dfbc5f7c11b4f228cd5176fba06c1098d3c4691 (patch)
tree9a5d49620fba4482df2e57c28be3c2db17af76a6 /ubuntu/_base
parent2615523142ab4627d334a1d83c31cefc7882de33 (diff)
downloadtde-packaging-0dfbc5f7c11b4f228cd5176fba06c1098d3c4691.tar.gz
tde-packaging-0dfbc5f7c11b4f228cd5176fba06c1098d3c4691.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> (cherry picked from commit f03fe2f1447badd293be7bf028a1839eeaf8dd5f)
Diffstat (limited to 'ubuntu/_base')
-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 6f8d18f51..0185d2c0d 100644
--- a/ubuntu/_base/tdelibs/debian/control
+++ b/ubuntu/_base/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: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